X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=ucs2-afb%2Fucs_binding.c;h=4b219340a9cc265b7240273a796ff81fe4ebae9a;hb=98fb362c23bcbd4bd300abe6154450e3fd37d250;hp=e7a940bddb1d0e39d63d6cff0dc1eb41bee3f013;hpb=434f6ca4736b4bcfe8865824b6134f79417e594b;p=apps%2Fagl-service-unicens.git diff --git a/ucs2-afb/ucs_binding.c b/ucs2-afb/ucs_binding.c index e7a940b..4b21934 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 "wrap-json.h" #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. @@ -61,15 +64,20 @@ typedef struct { CdevData_t rx; CdevData_t tx; UCSI_Data_t ucsiData; + UcsXmlVal_t* ucsConfig; } ucsContextT; typedef struct { struct afb_event node_event; - } EventData_t; -static ucsContextT *ucsContextS; +typedef struct { + struct afb_event 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); */ @@ -111,6 +119,7 @@ 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); } /* UCS2 Interface Timer Callback */ @@ -138,8 +147,7 @@ void UCSI_CB_OnUserMessage(void *pTag, bool isError, const char format[], va_start(argptr, vargsCnt); vsprintf(outbuf, format, argptr); va_end(argptr); - if (isError) - AFB_NOTICE ("%s",outbuf); + AFB_NOTICE ("%s",outbuf); } /** UCSI_Service cannot be called directly within UNICENS context, need to service stack through mainloop */ @@ -183,6 +191,15 @@ PUBLIC void UCSI_CB_OnTxRequest(void *pTag, const uint8_t *pData, uint32_t len) } } +/** UcsXml_FreeVal be called directly within UNICENS context, need to service stack through mainloop */ +STATIC int OnStopCB (sd_event_source *source, uint64_t usec, void *pTag) { + if (NULL != ucsContextS && NULL != ucsContextS->ucsConfig) { + UcsXml_FreeVal(ucsContextS->ucsConfig); + ucsContextS->ucsConfig = NULL; + } + return 0; +} + /** * \brief Callback when UNICENS instance has been stopped. * \note This event can be used to free memory holding the resources @@ -191,24 +208,78 @@ PUBLIC void UCSI_CB_OnTxRequest(void *pTag, const uint8_t *pData, uint32_t len) * \param pTag - Pointer given by the integrator by UCSI_Init */ void UCSI_CB_OnStop(void *pTag) { - AFB_NOTICE ("UNICENS stopped"); + AFB_NOTICE ("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); +} + +/* 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_NOTICE("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_DEBUG("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_daemon_get_event_loop(), &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); } 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); } PUBLIC void UCSI_CB_OnMgrReport(void *pTag, Ucs_MgrReport_t code, uint16_t nodeAddress, Ucs_Rm_Node_t *pNode){ @@ -320,7 +391,7 @@ STATIC UcsXmlVal_t* ParseFile(const char *filename) { ssize_t readSize; int fdHandle ; struct stat fdStat; - UcsXmlVal_t* ucsConfig; + UcsXmlVal_t *ucsConfig = NULL; fdHandle = open(filename, O_RDONLY); if (fdHandle <= 0) { @@ -345,6 +416,7 @@ STATIC UcsXmlVal_t* ParseFile(const char *filename) { AFB_ERROR("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)); return (ucsConfig); @@ -353,15 +425,14 @@ STATIC UcsXmlVal_t* ParseFile(const char *filename) { } PUBLIC int StartConfiguration(const char *filename) { - static UcsXmlVal_t *ucsConfig; - static ucsContextT ucsContext; + static ucsContextT ucsContext = { 0 }; sd_event_source *evtSource; int err; /* Read and parse XML file */ - ucsConfig = ParseFile(filename); - if (NULL == ucsConfig) { + ucsContext.ucsConfig = ParseFile(filename); + if (NULL == ucsContext.ucsConfig) { AFB_ERROR ("Cannot access or load file: '%s'", filename); goto OnErrorExit; } @@ -388,7 +459,7 @@ PUBLIC int StartConfiguration(const char *filename) { ucsContextS = &ucsContext; } /* Initialise UNICENS with parsed config */ - if (!UCSI_NewConfig(&ucsContext.ucsiData, ucsConfig)) { + if (!UCSI_NewConfig(&ucsContext.ucsiData, ucsContext.ucsConfig)) { AFB_ERROR ("Fail to initialize UNICENS"); goto OnErrorExit; } @@ -496,6 +567,75 @@ OnExitError: return; } +PUBLIC void ucs2_subscriberx (struct afb_req request) { + + if (!eventDataRx) { + + eventDataRx = malloc(sizeof(EventDataRx_t)); + if (eventDataRx) { + eventDataRx->rx_event = afb_daemon_make_event("rx-message"); + } + + if (!eventDataRx || !afb_event_is_valid(eventDataRx->rx_event)) { + afb_req_fail_f(request, "create-event", "Cannot create or register event"); + goto OnExitError; + } + } + + if (afb_req_subscribe(request, eventDataRx->rx_event) != 0) { + + afb_req_fail_f (request, "subscribe-event", "Cannot subscribe to event"); + goto OnExitError; + } + + afb_req_success(request,NULL,"event subscription successful"); + +OnExitError: + return; +} + +static json_object * ucs2_validate_command (struct afb_req request, + const char* func_name) { + + struct json_object *j_obj = NULL; + + if (!ucsContextS) { /* check UNICENS is initialized */ + afb_req_fail_f(request, "unicens-init", + "Load a configuration before calling %s.", + func_name); + 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; + } + + AFB_DEBUG("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_fail_f(request, + "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){ @@ -527,28 +667,34 @@ STATIC void ucs2_writei2c_cmd(struct afb_req request, json_object *j_obj) { 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_NOTICE("node_address: 0x%02X", node_addr); + if (node_addr == 0) { + afb_req_fail_f(request, "query-params","param node invalid type"); + goto OnErrorExit; + } + } + else { + afb_req_fail_f(request, "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; @@ -601,41 +747,43 @@ PUBLIC void ucs2_writei2c (struct afb_req 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 = ucs2_validate_command(request, "writei2c"); - 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; - }; + if (j_obj) { + ucs2_writei2c_cmd(request, j_obj); + } +} - AFB_DEBUG("request: %s", json_object_to_json_string(j_obj)); +PUBLIC void ucs2_sendmessage(struct afb_req req) { + uint8_t *data_ptr = NULL; + size_t data_sz = 0; + int ret, node_addr, msg_id = 0; + struct json_object *j_obj; - if (json_object_get_type(j_obj)==json_type_array) { + j_obj = ucs2_validate_command(req, "sendmessageb64"); - int cnt; - int len = json_object_array_length(j_obj); - - if (len != 1) { - afb_req_fail_f(request, "query-array","query of multiple commands is not supported"); - goto OnErrorExit; - } + if (!j_obj) { + AFB_NOTICE("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_success(req, NULL, "sendmessageb64 started successful"); } else { - ucs2_writei2c_cmd(request, j_obj); + AFB_ERROR("sendmessageb64: scheduling command failed. ret: %d", ret); + afb_req_fail_f(req, "query-command-queue","ambiguous command or queue overload"); + goto OnErrorExit; } - OnErrorExit: +OnErrorExit: + if (data_ptr) { + free(data_ptr); + } return; }