X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=ucs2-afb%2Fucs_binding.c;h=fc8d613c798de45ebab20a538c7711604336f8db;hb=475f9d3205488d590c3ee6d61c1a61279102e7b8;hp=1819407d38ab2cb5b5c0e8466335f0a761f30bb2;hpb=44f3b1d3f57c71157c968330d9f8278393a9ad98;p=apps%2Fagl-service-unicens.git diff --git a/ucs2-afb/ucs_binding.c b/ucs2-afb/ucs_binding.c index 1819407..fc8d613 100644 --- a/ucs2-afb/ucs_binding.c +++ b/ucs2-afb/ucs_binding.c @@ -104,14 +104,24 @@ PUBLIC void UCSI_CB_OnSetServiceTimer(void *pTag, uint16_t timeout) { } -/** Callback when ever UNICENS forms a human readable message. */ -void UCSI_CB_OnUserMessage(void *pTag, const char format[], +/** + * \brief Callback when ever an Unicens forms a human readable message. + * This can be error events or when enabled also debug messages. + * \note This function must be implemented by the integrator + * \param pTag - Pointer given by the integrator by UCSI_Init + * \param format - Zero terminated format string (following printf rules) + * \param vargsCnt - Amount of parameters stored in "..." + */ +void UCSI_CB_OnUserMessage(void *pTag, bool isError, const char format[], uint16_t vargsCnt, ...) { - //DEBUG (afbIface, format, args); - va_list args; - va_start (args, format); - vfprintf (stderr, format, args); - va_end(args); + va_list argptr; + char outbuf[300]; + pTag = pTag; + va_start(argptr, vargsCnt); + vsprintf(outbuf, format, argptr); + va_end(argptr); + if (isError) + NOTICE (afbIface, outbuf); } /** UCSI_Service cannot be called directly within UNICENS context, need to service stack through mainloop */ @@ -130,31 +140,12 @@ PUBLIC void UCSI_CB_OnServiceRequired(void *pTag) { sd_event_add_time(afb_daemon_get_event_loop(afbIface->daemon), NULL, CLOCK_MONOTONIC, 0, 0, OnServiceRequiredCB, pTag); } - -/** - * \brief Callback when ever a MOST error message was received. - * \note This function must be implemented by the integrator - * \param pTag - Pointer given by the integrator by UCSI_Init - * \note All following parameters belong to the usual MOST message - */ -PUBLIC void UCSI_CB_OnMostError(void *pTag, uint16_t sourceAddr, - uint8_t fblock, uint8_t inst, uint16_t function, uint8_t op, - const uint8_t *pPayload, uint32_t payloadLen) { - - // Error to send to syslog - DEBUG (afbIface, "OnMostError source=0x%x", sourceAddr); -} - - - /* Callback when ever this UNICENS wants to send a message to INIC. */ -PUBLIC void UCSI_CB_SendMostMessage(void *pTag, const uint8_t *pData, uint32_t len) { - +PUBLIC void UCSI_CB_OnTxRequest(void *pTag, const uint8_t *pData, uint32_t len) { ucsContextT *ucsContext = (ucsContextT*) pTag; CdevData_t *cdevTx = &ucsContext->tx; uint32_t total = 0; - if (NULL == pData || 0 == len) return; if (O_RDONLY == cdevTx->fileFlags) return; @@ -167,13 +158,11 @@ PUBLIC void UCSI_CB_SendMostMessage(void *pTag, const uint8_t *pData, uint32_t l ssize_t written = write(cdevTx->fileHandle, &pData[total], (len - total)); if (0 >= written) { - cdevTx->fileHandle = -1; - return; + /* Silently ignore write error (only occur in non-blocking mode) */ + break; } total += (uint32_t) written; } - - return; } /** @@ -188,17 +177,12 @@ void UCSI_CB_OnStop(void *pTag) { } -/** - * \brief Callback on Unicens management results. - * \note This function must be implemented by the integrator - * \param pTag - Pointer given by the integrator by UCSI_Init - * \param code - Result code - * \param nodeAddress - Node address of the device causing this event - * \param pNode - Pointer to node structure holding details of changed node - */ -extern void UCSI_CB_OnMgrReport(void *pTag, Ucs_MgrReport_t code, uint16_t nodeAddress, Ucs_Rm_Node_t *pNode) { - - DEBUG (afbIface, "OnMgrReport: Ucs_MgrReport_t=%d nodeAdresse=0x%x", code, nodeAddress); +/** 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 */ } bool Cdev_Init(CdevData_t *d, const char *fileName, bool read, bool write) @@ -243,7 +227,8 @@ int onReadCB (sd_event_source* src, int fileFd, uint32_t revents, void* pTag) { int ok; len = read (ucsContext->rx.fileHandle, &pBuffer, sizeof(pBuffer)); - + if (0 == len) + return 0; ok= UCSI_ProcessRxData(&ucsContext->ucsiData, pBuffer, (uint16_t)len); if (!ok) { DEBUG (afbIface, "Buffer overrun (not handle)"); @@ -442,36 +427,38 @@ PUBLIC void ucs2Init (struct afb_req request) { ucsConfig = ParseFile (request); if (NULL == ucsConfig) goto OnErrorExit; - // Fulup->Thorsten BUG InitializeCdevs should fail when control does not exit - if (!InitializeCdevs(&ucsContext)) { - afb_req_fail_f (request, "devnit-error", "Fail to initialise device [rx=%s tx=%s]", CONTROL_CDEV_RX, CONTROL_CDEV_TX); - goto OnErrorExit; - } + /* When ucsContextS is set, do not initalize UNICENS, CDEVs or system hooks, just load new XML */ + if (!ucsContextS) + { + if (!ucsContextS && !InitializeCdevs(&ucsContext)) { + afb_req_fail_f (request, "devnit-error", "Fail to initialise device [rx=%s tx=%s]", CONTROL_CDEV_RX, CONTROL_CDEV_TX); + goto OnErrorExit; + } - // Initialise Unicens Config Data Structure - UCSI_Init(&ucsContext.ucsiData, &ucsContext); + /* Initialise UNICENS Config Data Structure */ + UCSI_Init(&ucsContext.ucsiData, &ucsContext); - // Initialise Unicens with parsed config - if (!UCSI_NewConfig(&ucsContext.ucsiData, ucsConfig)) { - afb_req_fail_f (request, "UNICENS-init", "Fail to initialize Unicens"); - goto OnErrorExit; - } + /* register aplayHandle file fd into binder mainloop */ + err = sd_event_add_io(afb_daemon_get_event_loop(afbIface->daemon), &evtSource, ucsContext.rx.fileHandle, EPOLLIN, onReadCB, &ucsContext); + if (err < 0) { + afb_req_fail_f (request, "register-mainloop", "Cannot hook events to mainloop"); + goto OnErrorExit; + } - // register aplayHandle file fd into binder mainloop - err = sd_event_add_io(afb_daemon_get_event_loop(afbIface->daemon), &evtSource, ucsContext.rx.fileHandle, EPOLLIN, onReadCB, &ucsContext); - if (err < 0) { - afb_req_fail_f (request, "register-mainloop", "Cannot hook events to mainloop"); - goto OnErrorExit; + /* init UNICENS Volume Library */ + ucsContext.channels = UCSI_Vol_Init (&ucsContext.ucsiData, volumeCB); + if (!ucsContext.channels) { + afb_req_fail_f (request, "register-volume", "Could not enqueue new Unicens config"); + goto OnErrorExit; + } + /* save this in a statical variable until ucs2vol move to C */ + ucsContextS = &ucsContext; } - - // init Unicens Volume Library - ucsContext.channels = UCSI_Vol_Init (&ucsContext.ucsiData, volumeCB); - if (!ucsContext.channels) { - afb_req_fail_f (request, "register-volume", "Could not enqueue new Unicens config"); + /* Initialise UNICENS with parsed config */ + if (!UCSI_NewConfig(&ucsContext.ucsiData, ucsConfig)) { + afb_req_fail_f (request, "UNICENS-init", "Fail to initialize UNICENS"); goto OnErrorExit; } - // save this in a statical variable until ucs2vol move to C - ucsContextS = &ucsContext; afb_req_success(request,NULL,"UNICENS-active");