X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=ucs2-interface%2Fucs-xml%2FUcsXml_Private.c;h=4fb4e0c5ca36cf9aefac8f37bcf697b9135caf91;hb=refs%2Ftags%2Fhalibut_8.0.6;hp=b447bce164fb0cb83476b03d0f8e404560d34db6;hpb=dbbd5b4964615a63205fb9433f827f67265541de;p=apps%2Fagl-service-unicens.git diff --git a/ucs2-interface/ucs-xml/UcsXml_Private.c b/ucs2-interface/ucs-xml/UcsXml_Private.c index b447bce..4fb4e0c 100644 --- a/ucs2-interface/ucs-xml/UcsXml_Private.c +++ b/ucs2-interface/ucs-xml/UcsXml_Private.c @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------------------------*/ -/* Unicens XML Parser */ +/* UNICENS XML Parser */ /* Copyright 2017, Microchip Technology Inc. and its subsidiaries. */ /* */ /* Redistribution and use in source and binary forms, with or without */ @@ -31,6 +31,7 @@ #include #include #include +#include "UcsXml.h" #include "UcsXml_Private.h" static const char* USB_PHY_STANDARD = "Standard"; @@ -64,13 +65,9 @@ static const char* I2S_PIN_SRXB1 = "SRXB1"; static const char* MUTE_OFF = "NoMuting"; static const char* MUTE_SIGNAL = "MuteSignal"; -/* -static const char* VAL_TRUE = "true"; -static const char* VAL_FALSE = "false"; - */ -#define ASSERT_FALSE() { assert(false); return false; } -#define CHECK_POINTER(PTR) if (NULL == PTR) { ASSERT_FALSE(); } +#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; } +#define CHECK_POINTER(PTR) if (NULL == PTR) { ASSERT_FALSE(PTR, "NULL pointer"); } static int32_t Str2Int(const char *val) { @@ -82,7 +79,7 @@ void *MCalloc(struct UcsXmlObjectList *list, uint32_t nElem, uint32_t elemSize) void *obj; struct UcsXmlObjectList *tail = list; if (NULL == list || 0 == nElem || 0 == elemSize) return NULL; - + obj = calloc(nElem, elemSize); if (NULL == obj) { @@ -149,7 +146,7 @@ bool GetMostSocket(Ucs_Xrm_MostSocket_t **mostSoc, struct MostSocketParameters * soc->data_type = UCS_MOST_SCKT_DISC_FRAME_PHASE; break; default: - ASSERT_FALSE(); + ASSERT_FALSE("GetMostSocket->dataType", ""); } return true; } @@ -176,7 +173,7 @@ bool GetUsbPort(Ucs_Xrm_UsbPort_t **usbPort, struct UsbPortParameters *param) port->physical_layer = UCS_USB_PHY_LAYER_STANDARD; else if (0 == strcmp(USB_PHY_HSIC, param->physicalLayer)) port->physical_layer = UCS_USB_PHY_LAYER_HSCI; - else ASSERT_FALSE(); + else ASSERT_FALSE("GetUsbPort->physical_layer", param->physicalLayer); return true; } @@ -220,7 +217,7 @@ bool GetUsbSocket(Ucs_Xrm_UsbSocket_t **usbSoc, struct UsbSocketParameters *para soc->data_type = UCS_USB_SCKT_IPC_PACKET; break; default: - ASSERT_FALSE(); + ASSERT_FALSE("GetUsbSocket->dataType", ""); } soc->end_point_addr = (uint8_t)Str2Int(param->endpointAddress); soc->frames_per_transfer = (uint16_t)Str2Int(param->framesPerTrans); @@ -256,7 +253,7 @@ bool GetMlbPort(Ucs_Xrm_MlbPort_t **mlbPort, struct MlbPortParameters *param) port->clock_config = UCS_MLB_CLK_CFG_6144_FS; else if (0 == strcmp(param->clockConfig, CLOCK_8192FS)) port->clock_config = UCS_MLB_CLK_CFG_8192_FS; - else ASSERT_FALSE(); + else ASSERT_FALSE("GetMlbPort->clockConfig", param->clockConfig); return true; } @@ -306,7 +303,7 @@ bool GetMlbSocket(Ucs_Xrm_MlbSocket_t **mlbSoc, struct MlbSocketParameters *para soc->data_type = UCS_MLB_SCKT_IPC_PACKET; break; default: - ASSERT_FALSE(); + ASSERT_FALSE("GetMlbSocket->dataType", ""); } soc->channel_address = (uint16_t)Str2Int(param->channelAddress); soc->mlb_port_obj_ptr = param->mlbPort; @@ -343,7 +340,7 @@ bool GetStrmPort(Ucs_Xrm_StrmPort_t **strmPort, struct StrmPortParameters *param port->clock_config = UCS_STREAM_PORT_CLK_CFG_512FS; else if (0 == strcmp(param->clockConfig, CLOCK_WILDCARD)) port->clock_config = UCS_STREAM_PORT_CLK_CFG_WILD; - else ASSERT_FALSE(); + else ASSERT_FALSE("GetStrmPort->clockConfig", param->clockConfig); } else { port->clock_config = UCS_STREAM_PORT_CLK_CFG_WILD; } @@ -358,7 +355,7 @@ bool GetStrmPort(Ucs_Xrm_StrmPort_t **strmPort, struct StrmPortParameters *param port->data_alignment = UCS_STREAM_PORT_ALGN_RIGHT24BIT; else if (0 == strcmp(param->dataAlignment, STRM_ALIGN_SEQUENTIAL)) port->data_alignment = UCS_STREAM_PORT_ALGN_SEQ; - else ASSERT_FALSE(); + else ASSERT_FALSE("GetStrmPort->dataAlignment", param->dataAlignment); return true; } @@ -382,7 +379,7 @@ bool GetStrmSocket(Ucs_Xrm_StrmSocket_t **strmSoc, struct StrmSocketParameters * soc->data_type = UCS_STREAM_PORT_SCKT_SYNC_DATA; break; default: - ASSERT_FALSE(); + ASSERT_FALSE("GetStrmSocket->dataType", ""); } soc->bandwidth = param->bandwidth; if (0 == strcmp(param->streamPin, I2S_PIN_SRXA0)) @@ -409,7 +406,7 @@ bool GetStrmSocket(Ucs_Xrm_StrmSocket_t **strmSoc, struct StrmSocketParameters * soc->stream_port_obj_ptr = param->streamPortB; return true; } - else ASSERT_FALSE(); + else ASSERT_FALSE("GetStrmSocket->streamPin", param->streamPin); return true; } @@ -462,7 +459,7 @@ bool GetSyncCon(Ucs_Xrm_SyncCon_t **syncCon, struct SyncConParameters *param) con->mute_mode = UCS_SYNC_MUTE_MODE_NO_MUTING; else if (0 == strcmp(param->muteMode, MUTE_SIGNAL)) con->mute_mode = UCS_SYNC_MUTE_MODE_MUTE_SIGNAL; - else ASSERT_FALSE(); + else ASSERT_FALSE("GetSyncCon->mute_mode", param->muteMode); if (param->optional_offset) con->offset = (uint16_t)Str2Int(param->optional_offset); else @@ -501,10 +498,10 @@ bool GetAvpCon(Ucs_Xrm_AvpCon_t **avpCon, struct AvpConParameters *param) con->isoc_packet_size = UCS_ISOC_PCKT_SIZE_206; break; default: - ASSERT_FALSE(); + ASSERT_FALSE("GetAvpCon->isoc_packet_size", ""); } } else { con->isoc_packet_size = UCS_ISOC_PCKT_SIZE_188; } return true; -} \ No newline at end of file +}