X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=ucs2-afb%2Fucs_binding.c;h=8a1174c478a5cb3f5f241296634ca5cb4dd83d7a;hb=01475efcf23f47c13f44b057e42decb916117d67;hp=b42c3ff4924e811e0dd49c0f301754161b40beae;hpb=f892ce6d36b2287c5f54ae2a819b5342ef6ec22f;p=apps%2Fagl-service-unicens.git diff --git a/ucs2-afb/ucs_binding.c b/ucs2-afb/ucs_binding.c index b42c3ff..8a1174c 100644 --- a/ucs2-afb/ucs_binding.c +++ b/ucs2-afb/ucs_binding.c @@ -23,6 +23,7 @@ #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 */ #include #include @@ -39,8 +40,6 @@ #include "ucs_binding.h" #include "ucs_interface.h" - - #define MAX_FILENAME_LEN (100) #define RX_BUFFER (64) @@ -63,9 +62,13 @@ typedef struct { UCSI_channelsT *channels; } ucsContextT; -static ucsContextT *ucsContextS; +typedef struct { + struct afb_event node_event; + +} EventData_t; -STATIC void ucs2_write_i2c_response(void *result_ptr, void *request_ptr); +static ucsContextT *ucsContextS; +static EventData_t *eventData = NULL; PUBLIC void UcsXml_CB_OnError(const char format[], uint16_t vargsCnt, ...) { /*AFB_DEBUG (afbIface, format, args); */ @@ -203,6 +206,31 @@ void UCSI_CB_OnGpioStateChange(void *pTag, uint16_t nodeAddress, uint8_t gpioPin { } +PUBLIC void UCSI_CB_OnMgrReport(void *pTag, Ucs_MgrReport_t code, uint16_t nodeAddress, Ucs_Rm_Node_t *pNode){ + + bool available; + + if (code == UCS_MGR_REP_AVAILABLE) { + available = true; + } + else if (code == UCS_MGR_REP_NOT_AVAILABLE) { + available = false; + } + else { + /*untracked event - just exit*/ + return; + } + + if (eventData) { + + json_object *j_event_info = json_object_new_object(); + json_object_object_add(j_event_info, "node", json_object_new_int(nodeAddress)); + json_object_object_add(j_event_info, "available", json_object_new_boolean(available)); + + afb_event_push(eventData->node_event, j_event_info); + } +} + bool Cdev_Init(CdevData_t *d, const char *fileName, bool read, bool write) { if (NULL == d || NULL == fileName) goto OnErrorExit; @@ -534,27 +562,64 @@ PUBLIC void ucs2_listconfig (struct afb_req request) { return; } -PUBLIC void ucs2_monitor (struct afb_req request) { +PUBLIC void ucs2_subscribe (struct afb_req request) { - afb_req_success(request,NULL,"UNICENS-to_be_done"); + if (!eventData) { + + eventData = malloc(sizeof(EventData_t)); + if (eventData) { + eventData->node_event = afb_daemon_make_event ("node-availibility"); + } + + if (!eventData || !afb_event_is_valid(eventData->node_event)) { + afb_req_fail_f (request, "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"); + goto OnExitError; + } + + afb_req_success(request,NULL,"event subscription successful"); + +OnExitError: + return; } -#define MUTE_VALUE 0x03FFU -#define MUTE_VALUE_HB 0x03U -#define MUTE_VALUE_LB 0xFFU - -#define CONTROL_MASTER 0x07U -#define CONTROL_CH_1 0x08U -#define CONTROL_CH_2 0x09U - -#define UCSB_I2C_MAX_PAYLOAD 32 +STATIC void ucs2_writei2c_CB (void *result_ptr, void *request_ptr) { + + if (request_ptr){ + afb_req *req = (afb_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"); + } + else if (*res != UCS_I2C_RES_SUCCESS){ + afb_req_fail_f(*req, "error-result", "result code: %d", *res); + } + else { + afb_req_success(*req, NULL, "success"); + } + + afb_req_unref(*req); + free(request_ptr); + } + else { + AFB_NOTICE("write_i2c: ambiguous response data"); + } +} -PUBLIC void ucs2_write_i2c (struct afb_req request) { +PUBLIC void ucs2_writei2c (struct afb_req request) { struct json_object *j_obj; - static uint8_t tx_payload[UCSB_I2C_MAX_PAYLOAD]; - uint8_t tx_payload_sz = 0; + 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; /* check UNICENS is initialised */ if (!ucsContextS) { @@ -568,7 +633,7 @@ PUBLIC void ucs2_write_i2c (struct afb_req request) { goto OnErrorExit; }; - node_addr = (uint16_t)json_object_get_int(json_object_object_get(j_obj, "node_address")); + 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) { @@ -576,14 +641,14 @@ PUBLIC void ucs2_write_i2c (struct afb_req request) { goto OnErrorExit; } - if (json_object_get_type(json_object_object_get(j_obj, "i2c_data"))==json_type_array) { - int size = json_object_array_length(json_object_object_get(j_obj, "i2c_data")); - if ((size > 0) && (size <= UCSB_I2C_MAX_PAYLOAD)) { + 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")); + 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, "i2c_data"); + struct json_object *j_arr = json_object_object_get(j_obj, "data"); for (i = 0; i < size; i++) { @@ -594,54 +659,44 @@ PUBLIC void ucs2_write_i2c (struct afb_req request) { i = 0; break; } - tx_payload[i] = (uint8_t)json_object_get_int(j_elem); + i2c_data[i] = (uint8_t)json_object_get_int(j_elem); } - tx_payload_sz = (uint8_t)i; + i2c_data_sz = (uint8_t)i; } } - if (tx_payload_sz == 0) { - AFB_NOTICE("i2c_data: invalid or not found"); + if (i2c_data_sz == 0) { + AFB_NOTICE("data: invalid or not found"); afb_req_fail_f(request, "query-params","params wrong or missing"); goto OnErrorExit; } - - UCSI_I2CWrite(&ucsContextS->ucsiData,/*UCSI_Data_t *pPriv*/ - node_addr, /*uint16_t targetAddress*/ - false, /*bool isBurst*/ - 0u, /* block count */ - 0x2Au, /* i2c slave address */ - 0x03E8u, /* timeout 1000 milliseconds */ - tx_payload_sz, /* uint8_t dataLen */ - &tx_payload[0], /* uint8_t *pData */ - ucs2_write_i2c_response, - (void*)&request - ); - - afb_req_success(request,NULL,"done!!!"); - OnErrorExit: - return; -} - -STATIC void ucs2_write_i2c_response(void *result_ptr, void *request_ptr) { + async_req_ptr = malloc(sizeof(afb_req)); + *async_req_ptr = request; - if (request_ptr){ - afb_req *req = (afb_req *)request_ptr; - Ucs_I2c_ResultCode_t *res = (Ucs_I2c_ResultCode_t *)result_ptr; - - if (!res) { - afb_req_fail(*req, NULL,"failure, result code not provided"); - } - else if (*res != UCS_I2C_RES_SUCCESS){ - afb_req_fail_f(*req, NULL, "failure, result code: %d", *res); - } - else { - afb_req_success(*req, NULL, "success"); - } - } + if (UCSI_I2CWrite( &ucsContextS->ucsiData, /* UCSI_Data_t *pPriv*/ + node_addr, /* uint16_t targetAddress*/ + false, /* bool isBurst*/ + 0u, /* block count */ + 0x2Au, /* i2c slave address */ + 0x03E8u, /* timeout 1000 milliseconds */ + i2c_data_sz, /* uint8_t dataLen */ + &i2c_data[0], /* uint8_t *pData */ + &ucs2_writei2c_CB, /* callback*/ + (void*)async_req_ptr /* callback argument */ + )) { + /* asynchronous command is running */ + afb_req_addref(request); + } else { - AFB_NOTICE("write_i2c: ambiguous response data"); + 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; + goto OnErrorExit; } + + OnErrorExit: + return; }