Improve general error handling

[apps/agl-service-unicens.git] / ucs2-interface / ucs-xml / UcsXml_Private.c

diff --git a/ucs2-interface/ucs-xml/UcsXml_Private.c b/ucs2-interface/ucs-xml/UcsXml_Private.c
index f914ccb..743598f 100644 (file)
--- a/ucs2-interface/ucs-xml/UcsXml_Private.c
+++ b/ucs2-interface/ucs-xml/UcsXml_Private.c
@@ -31,6 +31,7 @@
 #include <stdlib.h>\r
 #include <string.h>\r
 #include <assert.h>\r
+#include "UcsXml.h"\r
 #include "UcsXml_Private.h"\r
 \r
 static const char* USB_PHY_STANDARD =       "Standard";\r
@@ -69,8 +70,8 @@ static const char* VAL_TRUE =               "true";
 static const char* VAL_FALSE =              "false";\r
  */\r
 \r
-#define ASSERT_FALSE() { assert(false); return false; }\r
-#define CHECK_POINTER(PTR) if (NULL == PTR) { ASSERT_FALSE(); }\r
+#define ASSERT_FALSE(func, par) { UcsXml_CB_OnError("Parameter error in attribute=%s value=%s, file=%s, line=%d", 4, func, par,  __FILE__, __LINE__); return false; }\r
+#define CHECK_POINTER(PTR) if (NULL == PTR) { ASSERT_FALSE(PTR, "NULL pointer"); }\r
 \r
 static int32_t Str2Int(const char *val)\r
 {\r
@@ -149,7 +150,7 @@ bool GetMostSocket(Ucs_Xrm_MostSocket_t **mostSoc, struct MostSocketParameters *
         soc->data_type = UCS_MOST_SCKT_DISC_FRAME_PHASE;\r
         break;\r
     default:\r
-        ASSERT_FALSE();\r
+        ASSERT_FALSE("GetMostSocket->dataType", "");\r
     }\r
     return true;\r
 }\r
@@ -176,7 +177,7 @@ bool GetUsbPort(Ucs_Xrm_UsbPort_t **usbPort, struct UsbPortParameters *param)
         port->physical_layer = UCS_USB_PHY_LAYER_STANDARD;\r
     else if (0 == strcmp(USB_PHY_HSIC, param->physicalLayer))\r
         port->physical_layer = UCS_USB_PHY_LAYER_HSCI;\r
-    else ASSERT_FALSE();\r
+    else ASSERT_FALSE("GetUsbPort->physical_layer", param->physicalLayer);\r
     return true;\r
 }\r
 \r
@@ -220,7 +221,7 @@ bool GetUsbSocket(Ucs_Xrm_UsbSocket_t **usbSoc, struct UsbSocketParameters *para
         soc->data_type = UCS_USB_SCKT_IPC_PACKET;\r
         break;\r
     default:\r
-        ASSERT_FALSE();\r
+        ASSERT_FALSE("GetUsbSocket->dataType", "");\r
     }\r
     soc->end_point_addr = (uint8_t)Str2Int(param->endpointAddress);\r
     soc->frames_per_transfer = (uint16_t)Str2Int(param->framesPerTrans);\r
@@ -256,7 +257,7 @@ bool GetMlbPort(Ucs_Xrm_MlbPort_t **mlbPort, struct MlbPortParameters *param)
         port->clock_config = UCS_MLB_CLK_CFG_6144_FS;\r
     else if (0 == strcmp(param->clockConfig, CLOCK_8192FS))\r
         port->clock_config = UCS_MLB_CLK_CFG_8192_FS;\r
-    else ASSERT_FALSE();\r
+    else ASSERT_FALSE("GetMlbPort->clockConfig", param->clockConfig);\r
     return true;\r
 }\r
 \r
@@ -306,7 +307,7 @@ bool GetMlbSocket(Ucs_Xrm_MlbSocket_t **mlbSoc, struct MlbSocketParameters *para
         soc->data_type = UCS_MLB_SCKT_IPC_PACKET;\r
         break;\r
     default:\r
-        ASSERT_FALSE();\r
+        ASSERT_FALSE("GetMlbSocket->dataType", "");\r
     }\r
     soc->channel_address = (uint16_t)Str2Int(param->channelAddress);\r
     soc->mlb_port_obj_ptr = param->mlbPort;\r
@@ -343,7 +344,7 @@ bool GetStrmPort(Ucs_Xrm_StrmPort_t **strmPort, struct StrmPortParameters *param
             port->clock_config = UCS_STREAM_PORT_CLK_CFG_512FS;\r
         else if (0 == strcmp(param->clockConfig, CLOCK_WILDCARD))\r
             port->clock_config = UCS_STREAM_PORT_CLK_CFG_WILD;\r
-        else ASSERT_FALSE();\r
+        else ASSERT_FALSE("GetStrmPort->clockConfig", param->clockConfig);\r
     } else {\r
         port->clock_config = UCS_STREAM_PORT_CLK_CFG_WILD;\r
     }\r
@@ -358,7 +359,7 @@ bool GetStrmPort(Ucs_Xrm_StrmPort_t **strmPort, struct StrmPortParameters *param
         port->data_alignment = UCS_STREAM_PORT_ALGN_RIGHT24BIT;\r
     else if (0 == strcmp(param->dataAlignment, STRM_ALIGN_SEQUENTIAL))\r
         port->data_alignment = UCS_STREAM_PORT_ALGN_SEQ;\r
-    else ASSERT_FALSE();\r
+    else ASSERT_FALSE("GetStrmPort->dataAlignment", param->dataAlignment);\r
     return true;\r
 }\r
 \r
@@ -382,7 +383,7 @@ bool GetStrmSocket(Ucs_Xrm_StrmSocket_t **strmSoc, struct StrmSocketParameters *
         soc->data_type = UCS_STREAM_PORT_SCKT_SYNC_DATA;\r
         break;\r
     default:\r
-        ASSERT_FALSE();\r
+        ASSERT_FALSE("GetStrmSocket->dataType", "");\r
     }\r
     soc->bandwidth = param->bandwidth;\r
     if (0 == strcmp(param->streamPin, I2S_PIN_SRXA0))\r
@@ -409,7 +410,7 @@ bool GetStrmSocket(Ucs_Xrm_StrmSocket_t **strmSoc, struct StrmSocketParameters *
         soc->stream_port_obj_ptr = param->streamPortB;\r
         return true;\r
     }\r
-    else ASSERT_FALSE();\r
+    else ASSERT_FALSE("GetStrmSocket->streamPin", param->streamPin);\r
     return true;\r
 }\r
 \r
@@ -462,7 +463,7 @@ bool GetSyncCon(Ucs_Xrm_SyncCon_t **syncCon, struct SyncConParameters *param)
         con->mute_mode = UCS_SYNC_MUTE_MODE_NO_MUTING;\r
     else if (0 == strcmp(param->muteMode, MUTE_SIGNAL))\r
         con->mute_mode = UCS_SYNC_MUTE_MODE_MUTE_SIGNAL;\r
-    else ASSERT_FALSE();\r
+    else ASSERT_FALSE("GetSyncCon->mute_mode", param->muteMode);\r
     if (param->optional_offset)\r
         con->offset = (uint16_t)Str2Int(param->optional_offset);\r
     else\r
@@ -501,7 +502,7 @@ bool GetAvpCon(Ucs_Xrm_AvpCon_t **avpCon, struct AvpConParameters *param)
             con->isoc_packet_size = UCS_ISOC_PCKT_SIZE_206;\r
             break;\r
         default:\r
-            ASSERT_FALSE();\r
+            ASSERT_FALSE("GetAvpCon->isoc_packet_size", "");\r
         }\r
     } else {\r
         con->isoc_packet_size = UCS_ISOC_PCKT_SIZE_188;\r