Change all UNICENS words to upper case
[apps/agl-service-unicens.git] / ucs2-interface / ucs-xml / UcsXml.c
index efce887..fcbe5f5 100644 (file)
@@ -1,5 +1,5 @@
 /*------------------------------------------------------------------------------------------------*/\r
-/* Unicens XML Parser                                                                             */\r
+/* UNICENS XML Parser                                                                             */\r
 /* Copyright 2017, Microchip Technology Inc. and its subsidiaries.                                */\r
 /*                                                                                                */\r
 /* Redistribution and use in source and binary forms, with or without                             */\r
@@ -169,7 +169,7 @@ static const char* ALL_SOCKETS[] = { MOST_SOCKET, USB_SOCKET, MLB_SOCKET,
 #define MLB_PORT                            "MediaLBPort"\r
 #define USB_PORT                            "USBPort"\r
 #define STRM_PORT                           "StreamPort"\r
-static const char* ALL_PORTS[] = { MLB_PORT, USB_PORT, STRM_PORT };\r
+static const char* ALL_PORTS[] = { MLB_PORT, USB_PORT, STRM_PORT, NULL };\r
 \r
 static const char* PHYSICAL_LAYER =         "PhysicalLayer";\r
 static const char* DEVICE_INTERFACES =      "DeviceInterfaces";\r
@@ -756,7 +756,7 @@ static ParseResult_t ParseNode(mxml_node_t *node, PrivateData_t *priv)
                 UcsXml_CB_OnError("Unknown Port:'%s'", 1, txt);\r
                 RETURN_ASSERT(Parse_XmlError);\r
             }\r
-            if(!GetElementArray(port, ALL_SOCKETS, &txt, &port))\r
+            if(!GetElementArray(port, ALL_PORTS, &txt, &port))\r
                 break;\r
         }\r
     }\r
@@ -1158,12 +1158,11 @@ static ParseResult_t ParseScriptMsgSend(mxml_node_t *act, Ucs_Ns_Script_t *scr,
     if (!GetUInt8(act, OP_TYPE_REQUEST, &req->OpCode, true))\r
         RETURN_ASSERT(Parse_XmlError);\r
 \r
-    if (!GetUInt8(act, OP_TYPE_RESPONSE, &res->OpCode, true))\r
-        RETURN_ASSERT(Parse_XmlError);\r
-\r
     res->FBlockId = req->FBlockId;\r
     res->FunktId = req->FunktId;\r
-    GetPayload(act, PAYLOAD_RES_HEX, &res->DataPtr, &res->DataLen, 0, &priv->objList, false);\r
+\r
+    if (GetUInt8(act, OP_TYPE_RESPONSE, &res->OpCode, false))\r
+        GetPayload(act, PAYLOAD_RES_HEX, &res->DataPtr, &res->DataLen, 0, &priv->objList, false);\r
 \r
     if (!GetPayload(act, PAYLOAD_REQ_HEX, &req->DataPtr, &req->DataLen, 0, &priv->objList, true))\r
         RETURN_ASSERT(Parse_XmlError);\r