X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=ucs2-afb%2Fucs_binding.c;h=777b967a28fd76387fed35aaacbadb0b69765ee9;hb=refs%2Fchanges%2F22%2F24722%2F1;hp=b8a1ba89de2db299a6fcc426a970b20e436d4580;hpb=dccdd78ea136c2481f0558cb3030a9add3a2004a;p=apps%2Fagl-service-unicens.git diff --git a/ucs2-afb/ucs_binding.c b/ucs2-afb/ucs_binding.c index b8a1ba8..777b967 100644 --- a/ucs2-afb/ucs_binding.c +++ b/ucs2-afb/ucs_binding.c @@ -24,6 +24,8 @@ #define BUFFER_FRAME_COUNT 10 /* max frames in buffer */ #define WAIT_TIMER_US 1000000 /* default waiting timer 1s */ #define I2C_MAX_DATA_SZ 32 /* max. number of bytes to be written to i2c */ +#define CTRL_MAX_DATA_SZ 45 /* max. number of bytes to be written to control + * channel */ #include #include @@ -39,10 +41,11 @@ #include "ucs_binding.h" #include "ucs_interface.h" +#include #define MAX_FILENAME_LEN (100) #define RX_BUFFER (64) -#define XML_CONFIG_FOLDER "/data/" +#define XML_CONFIG_FOLDER "/var/" #define XML_CONFIG_FILE "config_multichannel_audio_kit.xml" /** Internal structure, enabling multiple instances of this component. @@ -65,26 +68,31 @@ typedef struct { } ucsContextT; typedef struct { - struct afb_event node_event; - + afb_event_t node_event; } EventData_t; +typedef struct { + afb_event_t rx_event; +} EventDataRx_t; + static ucsContextT *ucsContextS = NULL; static EventData_t *eventData = NULL; +static EventDataRx_t *eventDataRx = NULL; PUBLIC void UcsXml_CB_OnError(const char format[], uint16_t vargsCnt, ...) { - /*AFB_DEBUG (afbIface, format, args); */ + /*AFB_API_DEBUG (afbBindingRoot, afbIface, format, args); */ + /*you may activite logging to stdout here va_list args; va_start (args, vargsCnt); vfprintf (stderr, format, args); - va_end(args); + va_end(args);*/ va_list argptr; char outbuf[300]; va_start(argptr, vargsCnt); vsprintf(outbuf, format, argptr); va_end(argptr); - AFB_WARNING ("%s", outbuf); + AFB_API_WARNING (afbBindingRoot, "%s", outbuf); } PUBLIC uint16_t UCSI_CB_OnGetTime(void *pTag) { @@ -112,15 +120,15 @@ STATIC int onTimerCB (sd_event_source* source,uint64_t timer, void* pTag) { void UCSI_CB_OnNetworkState(void *pTag, bool isAvailable, uint16_t packetBandwidth, uint8_t amountOfNodes) { - AFB_NOTICE ("Network is available=%d, bw=%d, nodeCnt=%d", isAvailable, packetBandwidth, amountOfNodes); + AFB_API_NOTICE (afbBindingRoot, "Network is available=%d, bw=%d, nodeCnt=%d", isAvailable, packetBandwidth, amountOfNodes); } /* UCS2 Interface Timer Callback */ PUBLIC void UCSI_CB_OnSetServiceTimer(void *pTag, uint16_t timeout) { uint64_t usec; /* set a timer with 250ms accuracy */ - sd_event_now(afb_daemon_get_event_loop(), CLOCK_BOOTTIME, &usec); - sd_event_add_time(afb_daemon_get_event_loop(), NULL, CLOCK_MONOTONIC, usec + (timeout*1000), 250, onTimerCB, pTag); + sd_event_now(afb_api_get_event_loop(afbBindingRoot), CLOCK_BOOTTIME, &usec); + sd_event_add_time(afb_api_get_event_loop(afbBindingRoot), NULL, CLOCK_MONOTONIC, usec + (timeout*1000), 250, onTimerCB, pTag); } @@ -140,7 +148,7 @@ void UCSI_CB_OnUserMessage(void *pTag, bool isError, const char format[], va_start(argptr, vargsCnt); vsprintf(outbuf, format, argptr); va_end(argptr); - AFB_NOTICE ("%s",outbuf); + AFB_API_NOTICE (afbBindingRoot, "%s",outbuf); } /** UCSI_Service cannot be called directly within UNICENS context, need to service stack through mainloop */ @@ -156,7 +164,7 @@ STATIC int OnServiceRequiredCB (sd_event_source *source, uint64_t usec, void *pT PUBLIC void UCSI_CB_OnServiceRequired(void *pTag) { /* push an asynchronous request for loopback to call UCSI_Service */ - sd_event_add_time(afb_daemon_get_event_loop(), NULL, CLOCK_MONOTONIC, 0, 0, OnServiceRequiredCB, pTag); + sd_event_add_time(afb_api_get_event_loop(afbBindingRoot), NULL, CLOCK_MONOTONIC, 0, 0, OnServiceRequiredCB, pTag); } /* Callback when ever this UNICENS wants to send a message to INIC. */ @@ -190,6 +198,7 @@ STATIC int OnStopCB (sd_event_source *source, uint64_t usec, void *pTag) { UcsXml_FreeVal(ucsContextS->ucsConfig); ucsContextS->ucsConfig = NULL; } + return 0; } /** @@ -200,27 +209,78 @@ STATIC int OnStopCB (sd_event_source *source, uint64_t usec, void *pTag) { * \param pTag - Pointer given by the integrator by UCSI_Init */ void UCSI_CB_OnStop(void *pTag) { - AFB_NOTICE ("UNICENS stopped"); + AFB_API_NOTICE (afbBindingRoot, "UNICENS stopped"); /* push an asynchronous request for loopback to call UcsXml_FreeVal */ - sd_event_add_time(afb_daemon_get_event_loop(), NULL, CLOCK_MONOTONIC, 0, 0, OnStopCB, pTag); + sd_event_add_time(afb_api_get_event_loop(afbBindingRoot), NULL, CLOCK_MONOTONIC, 0, 0, OnStopCB, pTag); +} + +/* helper function: wraps Rx message in json and triggers notification */ +STATIC void NotifyEventRxMsg(uint16_t src_addr, uint16_t msg_id, uint8_t *data_ptr, uint32_t data_sz) { + + if (!eventDataRx) + return; + + if (data_sz > CTRL_MAX_DATA_SZ) { + AFB_API_NOTICE(afbBindingRoot, "RX-MSG: discarded, payload exceeds %d bytes", CTRL_MAX_DATA_SZ); + return; + } + + json_object *j_query = NULL; + int node = (int)src_addr; + int msgid = (int)msg_id; + size_t data_size = (size_t)data_sz; + + /* skip data attribute if possible, wrap_json_unpack may fail to deal with + * an empty Base64 string */ + if (data_size > 0) + wrap_json_pack(&j_query, "{s:i, s:i, s:Y*}", "node", node, "msgid", msgid, "data", data_ptr, data_size); + else + wrap_json_pack(&j_query, "{s:i, s:i}", "node", node, "msgid", msgid); + + afb_event_push(eventDataRx->rx_event, j_query); +} + +/** Asynchronous processing of Rx messages in mainloop is recommended */ +STATIC int OnAmsMessageReceivedCB (sd_event_source *source, void *pTag) { + ucsContextT *ucsContext = (ucsContextT*) pTag; + uint32_t data_sz = 0U; + uint8_t *data_ptr = NULL; + uint16_t msg_id = 0U; + uint16_t src_addr = 0U; + + while (UCSI_GetAmsMessage(&ucsContext->ucsiData, &msg_id, &src_addr, &data_ptr, &data_sz)) { + NotifyEventRxMsg(src_addr, msg_id, data_ptr, data_sz); + AFB_API_DEBUG(afbBindingRoot, "RX-MSG: src=0x%04X, msg_id=0x%04X, size=%d", src_addr, msg_id, data_sz); + UCSI_ReleaseAmsMessage(&ucsContext->ucsiData); + } + + return 0; } /** This callback will be raised, when ever an applicative message on the control channel arrived */ void UCSI_CB_OnAmsMessageReceived(void *pTag) { - /* If not interested, just ignore this event. - Otherwise UCSI_GetAmsMessage may now be called asynchronous (mainloop) to get the content. - Don't forget to call UCSI_ReleaseAmsMessage after that */ + static sd_event_source *src_ptr = NULL; + + if (!src_ptr) + { + /* first time usage: create and trigger event source */ + sd_event_add_defer(afb_api_get_event_loop(afbBindingRoot), &src_ptr, &OnAmsMessageReceivedCB, pTag); + } + else + { + sd_event_source_set_enabled(src_ptr, SD_EVENT_ONESHOT); + } } void UCSI_CB_OnRouteResult(void *pTag, uint16_t routeId, bool isActive, uint16_t connectionLabel) { - AFB_NOTICE ("Route 0x%X is active=%d, connection label=0x%X", routeId, isActive, connectionLabel); + AFB_API_NOTICE (afbBindingRoot, "Route 0x%X is active=%d, connection label=0x%X", routeId, isActive, connectionLabel); } void UCSI_CB_OnGpioStateChange(void *pTag, uint16_t nodeAddress, uint8_t gpioPinId, bool isHighState) { - AFB_NOTICE ("GPIO state of node 0x%X changed, pin=%d isHigh=%d", nodeAddress, gpioPinId, isHighState); + AFB_API_NOTICE (afbBindingRoot, "GPIO state of node 0x%X changed, pin=%d isHigh=%d", nodeAddress, gpioPinId, isHighState); } PUBLIC void UCSI_CB_OnMgrReport(void *pTag, Ucs_MgrReport_t code, uint16_t nodeAddress, Ucs_Rm_Node_t *pNode){ @@ -294,7 +354,7 @@ int onReadCB (sd_event_source* src, int fileFd, uint32_t revents, void* pTag) { return 0; ok= UCSI_ProcessRxData(&ucsContext->ucsiData, pBuffer, (uint16_t)len); if (!ok) { - AFB_DEBUG ("Buffer overrun (not handle)"); + AFB_API_DEBUG (afbBindingRoot, "Buffer overrun (not handle)"); /* Buffer overrun could replay pBuffer */ } return 0; @@ -306,19 +366,19 @@ STATIC char* GetDefaultConfig(void) { char const *data_path = getenv("AFM_APP_INSTALL_DIR"); if (!data_path) { - AFB_ERROR("AFM_APP_INSTALL_DIR is not defined"); + AFB_API_ERROR(afbBindingRoot, "AFM_APP_INSTALL_DIR is not defined"); } else { size_t size; char * config_path; - AFB_NOTICE("AFM_APP_INSTALL_DIR is: %s", data_path); + AFB_API_NOTICE(afbBindingRoot, "AFM_APP_INSTALL_DIR is: %s", data_path); size = strlen(data_path) + strlen(XML_CONFIG_FOLDER) + strlen(XML_CONFIG_FILE) + 2; config_path = malloc(size); if (config_path != NULL) { snprintf(config_path, size, "%s%s%s", data_path, XML_CONFIG_FOLDER, XML_CONFIG_FILE); if(access(config_path, R_OK ) == 0) { - AFB_NOTICE("Default configuration: %s", config_path); + AFB_API_NOTICE(afbBindingRoot, "Default configuration: %s", config_path); return config_path; } } @@ -336,7 +396,7 @@ STATIC UcsXmlVal_t* ParseFile(const char *filename) { fdHandle = open(filename, O_RDONLY); if (fdHandle <= 0) { - AFB_ERROR("File not accessible: '%s' err=%s", filename, strerror(fdHandle)); + AFB_API_ERROR(afbBindingRoot, "File not accessible: '%s' err=%s", filename, strerror(fdHandle)); goto OnErrorExit; } @@ -348,16 +408,16 @@ STATIC UcsXmlVal_t* ParseFile(const char *filename) { xmlBuffer[readSize] = '\0'; /* In any case, terminate it. */ if (readSize != fdStat.st_size) { - AFB_ERROR("File to read fullfile '%s' size(%d!=%d)", filename, (int)readSize, (int)fdStat.st_size); + AFB_API_ERROR(afbBindingRoot, "File to read fullfile '%s' size(%d!=%d)", filename, (int)readSize, (int)fdStat.st_size); goto OnErrorExit; } ucsConfig = UcsXml_Parse(xmlBuffer); if (!ucsConfig) { - AFB_ERROR("File XML invalid: '%s'", filename); + AFB_API_ERROR(afbBindingRoot, "File XML invalid: '%s'", filename); goto OnErrorExit; } - AFB_NOTICE ("Parsing result: %d Nodes, %d Scripts, Ethernet Bandwith %d bytes = %.2f MBit/s", ucsConfig->nodSize, ucsConfig->routesSize, ucsConfig->packetBw, (48 * 8 * ucsConfig->packetBw / 1000.0)); + AFB_API_NOTICE (afbBindingRoot, "Parsing result: %d Nodes, %d Scripts, Ethernet Bandwith %d bytes = %.2f MBit/s", ucsConfig->nodSize, ucsConfig->routesSize, ucsConfig->packetBw, (48 * 8 * ucsConfig->packetBw / 1000.0)); return (ucsConfig); @@ -374,7 +434,7 @@ PUBLIC int StartConfiguration(const char *filename) { /* Read and parse XML file */ ucsContext.ucsConfig = ParseFile(filename); if (NULL == ucsContext.ucsConfig) { - AFB_ERROR ("Cannot access or load file: '%s'", filename); + AFB_API_ERROR (afbBindingRoot, "Cannot access or load file: '%s'", filename); goto OnErrorExit; } @@ -382,7 +442,7 @@ PUBLIC int StartConfiguration(const char *filename) { if (!ucsContextS) { if (!ucsContextS && !InitializeCdevs(&ucsContext)) { - AFB_ERROR ("Fail to initialise device [rx=%s tx=%s]", CONTROL_CDEV_RX, CONTROL_CDEV_TX); + AFB_API_ERROR (afbBindingRoot, "Fail to initialise device [rx=%s tx=%s]", CONTROL_CDEV_RX, CONTROL_CDEV_TX); goto OnErrorExit; } @@ -390,9 +450,9 @@ PUBLIC int StartConfiguration(const char *filename) { UCSI_Init(&ucsContext.ucsiData, &ucsContext); /* register aplayHandle file fd into binder mainloop */ - err = sd_event_add_io(afb_daemon_get_event_loop(), &evtSource, ucsContext.rx.fileHandle, EPOLLIN, onReadCB, &ucsContext); + err = sd_event_add_io(afb_api_get_event_loop(afbBindingRoot), &evtSource, ucsContext.rx.fileHandle, EPOLLIN, onReadCB, &ucsContext); if (err < 0) { - AFB_ERROR ("Cannot hook events to mainloop"); + AFB_API_ERROR (afbBindingRoot, "Cannot hook events to mainloop"); goto OnErrorExit; } @@ -401,7 +461,7 @@ PUBLIC int StartConfiguration(const char *filename) { } /* Initialise UNICENS with parsed config */ if (!UCSI_NewConfig(&ucsContext.ucsiData, ucsContext.ucsConfig)) { - AFB_ERROR ("Fail to initialize UNICENS"); + AFB_API_ERROR (afbBindingRoot, "Fail to initialize UNICENS"); goto OnErrorExit; } @@ -411,20 +471,20 @@ PUBLIC int StartConfiguration(const char *filename) { return -1; } -PUBLIC void ucs2_initialise (struct afb_req request) { +PUBLIC void ucs2_initialise (afb_req_t request) { const char *filename = afb_req_value(request, "filename"); if (!filename) { - afb_req_fail_f (request, "filename-missing", "No filename given"); + afb_req_reply (request, NULL, "filename-missing", "No filename given"); goto OnErrorExit; } if (StartConfiguration(filename) != 0) { - afb_req_fail_f (request, "load-failed", "Cannot parse file and start UNICENS"); + afb_req_reply (request, NULL, "load-failed", "Cannot parse file and start UNICENS"); goto OnErrorExit; } - afb_req_success(request,NULL,"UNICENS-active"); + afb_req_reply(request,NULL, NULL,"UNICENS-active"); OnErrorExit: return; @@ -432,7 +492,7 @@ PUBLIC void ucs2_initialise (struct afb_req request) { // List Avaliable Configuration Files -PUBLIC void ucs2_listconfig (struct afb_req request) { +PUBLIC void ucs2_listconfig (afb_req_t request) { struct json_object *queryJ, *tmpJ, *responseJ; DIR *dirHandle; char *dirPath, *dirList; @@ -443,7 +503,7 @@ PUBLIC void ucs2_listconfig (struct afb_req request) { dirList = strdup (json_object_get_string(tmpJ)); } else { dirList = strdup (UCS2_CFG_PATH); - AFB_NOTICE ("fgpath:missing uses UCS2_CFG_PATH=%s", UCS2_CFG_PATH); + AFB_API_NOTICE (afbBindingRoot, "fgpath:missing uses UCS2_CFG_PATH=%s", UCS2_CFG_PATH); } responseJ = json_object_new_array(); @@ -452,12 +512,12 @@ PUBLIC void ucs2_listconfig (struct afb_req request) { dirHandle = opendir (dirPath); if (!dirHandle) { - AFB_NOTICE ("ucs2_listconfig dir=%s not readable", dirPath); + AFB_API_NOTICE (afbBindingRoot, "ucs2_listconfig dir=%s not readable", dirPath); error++; continue; } - AFB_NOTICE ("ucs2_listconfig scanning: %s", dirPath); + AFB_API_NOTICE (afbBindingRoot, "ucs2_listconfig scanning: %s", dirPath); while ((dirEnt = readdir(dirHandle)) != NULL) { // Unknown type is accepted to support dump filesystems if (dirEnt->d_type == DT_REG || dirEnt->d_type == DT_UNKNOWN) { @@ -471,96 +531,169 @@ PUBLIC void ucs2_listconfig (struct afb_req request) { free (dirList); - if (!error) afb_req_success(request,responseJ,NULL); + if (!error) afb_req_reply(request,responseJ, NULL,NULL); else { char info[40]; snprintf (info, sizeof(info), "[%d] where not scanned", error); - afb_req_success(request,responseJ, info); + afb_req_reply(request,responseJ, NULL, info); } return; } -PUBLIC void ucs2_subscribe (struct afb_req request) { +PUBLIC void ucs2_subscribe (afb_req_t request) { if (!eventData) { eventData = malloc(sizeof(EventData_t)); if (eventData) { - eventData->node_event = afb_daemon_make_event ("node-availibility"); + eventData->node_event = afb_api_make_event (afbBindingRoot, "node-availibility"); } if (!eventData || !afb_event_is_valid(eventData->node_event)) { - afb_req_fail_f (request, "create-event", "Cannot create or register event"); + afb_req_reply (request, NULL, "create-event", "Cannot create or register event"); goto OnExitError; } } if (afb_req_subscribe(request, eventData->node_event) != 0) { - afb_req_fail_f (request, "subscribe-event", "Cannot subscribe to event"); + afb_req_reply (request, NULL, "subscribe-event", "Cannot subscribe to event"); + goto OnExitError; + } + + afb_req_reply(request,NULL, NULL,"event subscription successful"); + +OnExitError: + return; +} + +PUBLIC void ucs2_subscriberx (afb_req_t request) { + + if (!eventDataRx) { + + eventDataRx = malloc(sizeof(EventDataRx_t)); + if (eventDataRx) { + eventDataRx->rx_event = afb_api_make_event(afbBindingRoot, "rx-message"); + } + + if (!eventDataRx || !afb_event_is_valid(eventDataRx->rx_event)) { + afb_req_reply(request, NULL, "create-event", "Cannot create or register event"); + goto OnExitError; + } + } + + if (afb_req_subscribe(request, eventDataRx->rx_event) != 0) { + + afb_req_reply (request, NULL, "subscribe-event", "Cannot subscribe to event"); goto OnExitError; } - afb_req_success(request,NULL,"event subscription successful"); + afb_req_reply(request,NULL, NULL,"event subscription successful"); OnExitError: return; } +static json_object * ucs2_validate_command (afb_req_t request, + const char* func_name) { + + struct json_object *j_obj = NULL; + + if (!ucsContextS) { /* check UNICENS is initialized */ + afb_req_reply_f(request, NULL, "unicens-init", + "Load a configuration before calling %s.", + func_name); + goto OnErrorExit; + } + + j_obj = afb_req_json(request); + if (!j_obj) { + afb_req_reply_f(request, NULL, + "query-notjson","query=%s not a valid json entry", + afb_req_value(request,"")); + goto OnErrorExit; + } + + AFB_API_DEBUG(afbBindingRoot, "request: %s", json_object_to_json_string(j_obj)); + + if (json_object_get_type(j_obj)==json_type_array) { + int len = json_object_array_length(j_obj); + + if (len == 1) { /* only support 1 command in array */ + j_obj = json_object_array_get_idx(j_obj, 0); + } + else { + afb_req_reply_f(request, NULL, + "query-array", + "query of multiple %s commands is not supported", + func_name); + j_obj = NULL; + goto OnErrorExit; + } + } + + OnErrorExit: + return j_obj; +} + STATIC void ucs2_writei2c_CB (void *result_ptr, void *request_ptr) { if (request_ptr){ - afb_req *req = (afb_req *)request_ptr; + afb_req_t req = request_ptr; Ucs_I2c_ResultCode_t *res = (Ucs_I2c_ResultCode_t *)result_ptr; if (!res) { - afb_req_fail(*req, "processing","busy or lost initialization"); + afb_req_reply(req, NULL, "processing","busy or lost initialization"); } else if (*res != UCS_I2C_RES_SUCCESS){ - afb_req_fail_f(*req, "error-result", "result code: %d", *res); + afb_req_reply_f(req, NULL, "error-result", "result code: %d", *res); } else { - afb_req_success(*req, NULL, "success"); + afb_req_reply(req, NULL, NULL, "success"); } - afb_req_unref(*req); - free(request_ptr); + afb_req_unref(req); } else { - AFB_NOTICE("write_i2c: ambiguous response data"); + AFB_API_NOTICE(afbBindingRoot, "write_i2c: ambiguous response data"); } } /* write a single i2c command */ -STATIC void ucs2_writei2c_cmd(struct afb_req request, json_object *j_obj) { +STATIC void ucs2_writei2c_cmd(afb_req_t request, json_object *j_obj) { static uint8_t i2c_data[I2C_MAX_DATA_SZ]; uint8_t i2c_data_sz = 0; uint16_t node_addr = 0; - struct afb_req *async_req_ptr = NULL; - - node_addr = (uint16_t)json_object_get_int(json_object_object_get(j_obj, "node")); - AFB_NOTICE("node_address: 0x%02X", node_addr); - - if (node_addr == 0) { - afb_req_fail_f(request, "query-params","params wrong or missing"); + json_object *j_tmp; + json_bool key_found; + + if (json_object_object_get_ex(j_obj, "node", &j_tmp)) { + node_addr = (uint16_t)json_object_get_int(j_tmp); + AFB_API_NOTICE(afbBindingRoot, "node_address: 0x%02X", node_addr); + if (node_addr == 0) { + afb_req_reply(request, NULL, "query-params","param node invalid type"); + goto OnErrorExit; + } + } + else { + afb_req_reply(request, NULL, "query-params","param node missing"); goto OnErrorExit; } - if (json_object_get_type(json_object_object_get(j_obj, "data"))==json_type_array) { - int size = json_object_array_length(json_object_object_get(j_obj, "data")); + key_found = json_object_object_get_ex(j_obj, "data", &j_tmp); + if (key_found && (json_object_get_type(j_tmp)==json_type_array)) { + int size = json_object_array_length(j_tmp); if ((size > 0) && (size <= I2C_MAX_DATA_SZ)) { int32_t i; int32_t val; struct json_object *j_elem; - struct json_object *j_arr = json_object_object_get(j_obj, "data"); for (i = 0; i < size; i++) { - - j_elem = json_object_array_get_idx(j_arr, i); + j_elem = json_object_array_get_idx(j_tmp, i); val = json_object_get_int(j_elem); if ((val < 0) && (val > 0xFF)){ i = 0; @@ -574,14 +707,11 @@ STATIC void ucs2_writei2c_cmd(struct afb_req request, json_object *j_obj) { } if (i2c_data_sz == 0) { - AFB_NOTICE("data: invalid or not found"); - afb_req_fail_f(request, "query-params","params wrong or missing"); + AFB_API_NOTICE(afbBindingRoot, "data: invalid or not found"); + afb_req_reply(request, NULL, "query-params","params wrong or missing"); goto OnErrorExit; } - async_req_ptr = malloc(sizeof(afb_req)); - *async_req_ptr = request; - if (UCSI_I2CWrite( &ucsContextS->ucsiData, /* UCSI_Data_t *pPriv*/ node_addr, /* uint16_t targetAddress*/ false, /* bool isBurst*/ @@ -591,16 +721,14 @@ STATIC void ucs2_writei2c_cmd(struct afb_req request, json_object *j_obj) { i2c_data_sz, /* uint8_t dataLen */ &i2c_data[0], /* uint8_t *pData */ &ucs2_writei2c_CB, /* callback*/ - (void*)async_req_ptr /* callback argument */ + (void*)request /* callback argument */ )) { /* asynchronous command is running */ afb_req_addref(request); } else { - AFB_NOTICE("i2c write: scheduling command failed"); - afb_req_fail_f(request, "query-command-queue","command queue overload"); - free(async_req_ptr); - async_req_ptr = NULL; + AFB_API_NOTICE(afbBindingRoot, "i2c write: scheduling command failed"); + afb_req_reply(request, NULL, "query-command-queue","command queue overload"); goto OnErrorExit; } @@ -609,58 +737,60 @@ OnErrorExit: } /* parse array or single command */ -PUBLIC void ucs2_writei2c (struct afb_req request) { +PUBLIC void ucs2_writei2c (afb_req_t request) { struct json_object *j_obj; - /* check UNICENS is initialised */ - if (!ucsContextS) { - afb_req_fail_f(request, "unicens-init","Should Load Config before using setvol"); - goto OnErrorExit; - } - - j_obj = afb_req_json(request); - if (!j_obj) { - afb_req_fail_f(request, "query-notjson","query=%s not a valid json entry", afb_req_value(request,"")); - goto OnErrorExit; - }; + j_obj = ucs2_validate_command(request, "writei2c"); - AFB_DEBUG("request: %s", json_object_to_json_string(j_obj)); + if (j_obj) { + ucs2_writei2c_cmd(request, j_obj); + } +} - if (json_object_get_type(j_obj)==json_type_array) { +PUBLIC void ucs2_sendmessage(afb_req_t req) { + uint8_t *data_ptr = NULL; + size_t data_sz = 0; + int ret, node_addr, msg_id = 0; + struct json_object *j_obj; - int cnt; - int len = json_object_array_length(j_obj); + j_obj = ucs2_validate_command(req, "sendmessageb64"); - if (len != 1) { - afb_req_fail_f(request, "query-array","query of multiple commands is not supported"); - goto OnErrorExit; - } + if (!j_obj) { + AFB_API_NOTICE(afbBindingRoot, "validation of command failed"); + goto OnErrorExit; + } - for (cnt = 0; cnt < len; cnt++) { + ret = wrap_json_unpack(j_obj, "{s:i, s:i, s?Y}", "node", &node_addr, "msgid", &msg_id, "data", &data_ptr, &data_sz); - json_object *j_cmd = json_object_array_get_idx(j_obj, cnt); - ucs2_writei2c_cmd(request, j_cmd); - } + if ((ret==0) && + UCSI_SendAmsMessage(&ucsContextS->ucsiData, msg_id, node_addr, &data_ptr[0], data_sz) + ) { + afb_req_reply(req, NULL, NULL, "sendmessageb64 started successful"); } else { - ucs2_writei2c_cmd(request, j_obj); + AFB_API_ERROR(afbBindingRoot, "sendmessageb64: scheduling command failed. ret: %d", ret); + afb_req_reply(req, NULL, "query-command-queue","ambiguous command or queue overload"); + goto OnErrorExit; } - OnErrorExit: +OnErrorExit: + if (data_ptr) { + free(data_ptr); + } return; } -PUBLIC int ucs2_initbinding(void) { +PUBLIC int ucs2_initbinding(afb_api_t api) { #ifndef DISABLE_AUTOSTART char *filename = GetDefaultConfig(); if (filename != NULL) { - AFB_NOTICE("AUTO-LOAD configuration: %s", filename); + AFB_API_NOTICE(afbBindingRoot, "AUTO-LOAD configuration: %s", filename); if (StartConfiguration(filename) == 0) { - AFB_NOTICE("AUTO-LOAD successful"); + AFB_API_NOTICE(afbBindingRoot, "AUTO-LOAD successful"); } else { - AFB_NOTICE("AUTO-LOAD failed"); + AFB_API_NOTICE(afbBindingRoot, "AUTO-LOAD failed"); } free(filename); }