X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=ucs2-afb%2Fucs_binding.c;h=fc8d613c798de45ebab20a538c7711604336f8db;hb=ce4eeb376e9fc3d0f3327a34dc7e4a3c0fdfc376;hp=c680ecb85153494c4d9034764e93eec5ee204c68;hpb=1cb82932afe865908badb3b4f989a8887609ef08;p=apps%2Fagl-service-unicens.git diff --git a/ucs2-afb/ucs_binding.c b/ucs2-afb/ucs_binding.c index c680ecb..fc8d613 100644 --- a/ucs2-afb/ucs_binding.c +++ b/ucs2-afb/ucs_binding.c @@ -21,8 +21,8 @@ #define _GNU_SOURCE -#define BUFFER_FRAME_COUNT 10 // max frames in buffer -#define WAIT_TIMER_US 1000000 // default waiting timer 1s +#define BUFFER_FRAME_COUNT 10 /* max frames in buffer */ +#define WAIT_TIMER_US 1000000 /* default waiting timer 1s */ #include #include @@ -65,9 +65,9 @@ typedef struct { static ucsContextT *ucsContextS; PUBLIC void UcsXml_CB_OnError(const char format[], uint16_t vargsCnt, ...) { - //DEBUG (afbIface, format, args); + /*DEBUG (afbIface, format, args); */ va_list args; - va_start (args, format); + va_start (args, vargsCnt); vfprintf (stderr, format, args); va_end(args); } @@ -95,10 +95,10 @@ STATIC int onTimerCB (sd_event_source* source,uint64_t timer, void* pTag) { return 0; } -// UCS2 Interface Timer Callback +/* UCS2 Interface Timer Callback */ PUBLIC void UCSI_CB_OnSetServiceTimer(void *pTag, uint16_t timeout) { uint64_t usec; - // set a timer with 250ms accuracy + /* set a timer with 250ms accuracy */ sd_event_now(afb_daemon_get_event_loop(afbIface->daemon), CLOCK_BOOTTIME, &usec); sd_event_add_time(afb_daemon_get_event_loop(afbIface->daemon), NULL, CLOCK_MONOTONIC, usec + (timeout*1000), 250, onTimerCB, pTag); @@ -112,16 +112,19 @@ PUBLIC void UCSI_CB_OnSetServiceTimer(void *pTag, uint16_t timeout) { * \param format - Zero terminated format string (following printf rules) * \param vargsCnt - Amount of parameters stored in "..." */ -void UCSI_CB_OnUserMessage(void *pTag, const char format[], +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 call directly within Unicens context, need to reset stack through mainloop +/** UCSI_Service cannot be called directly within UNICENS context, need to service stack through mainloop */ STATIC int OnServiceRequiredCB (sd_event_source *source, uint64_t usec, void *pTag) { ucsContextT *ucsContext = (ucsContextT*) pTag; @@ -130,33 +133,15 @@ STATIC int OnServiceRequiredCB (sd_event_source *source, uint64_t usec, void *pT return (0); } -// UCS Callback fire when ever pTag instance needs to be serviced +/* UCS Callback fire when ever UNICENS needs to be serviced */ PUBLIC void UCSI_CB_OnServiceRequired(void *pTag) { - // push an asynchronous request for loopback to call UCSI_Service + /* push an asynchronous request for loopback to call UCSI_Service */ 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; @@ -181,28 +166,23 @@ PUBLIC void UCSI_CB_SendMostMessage(void *pTag, const uint8_t *pData, uint32_t l } /** - * \brief Callback when Unicens instance has been stopped. + * \brief Callback when UNICENS instance has been stopped. * \note This event can be used to free memory holding the resources * passed with UCSI_NewConfig * \note This function must be implemented by the integrator * \param pTag - Pointer given by the integrator by UCSI_Init */ void UCSI_CB_OnStop(void *pTag) { - NOTICE (afbIface, "Unicens stopped"); + NOTICE (afbIface, "UNICENS stopped"); } -/** - * \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) @@ -220,7 +200,7 @@ bool Cdev_Init(CdevData_t *d, const char *fileName, bool read, bool write) else if (write) d->fileFlags = O_WRONLY | O_NONBLOCK; - // open file to enable event loop + /* open file to enable event loop */ d->fileHandle = open(d->fileName, d->fileFlags); if (d->fileHandle <= 0) goto OnErrorExit; @@ -239,7 +219,7 @@ static bool InitializeCdevs(ucsContextT *ucsContext) return true; } -// Callback fire when something is avaliable on MOST cdev +/* Callback fire when something is avaliable on MOST cdev */ int onReadCB (sd_event_source* src, int fileFd, uint32_t revents, void* pTag) { ucsContextT *ucsContext =( ucsContextT*) pTag; ssize_t len; @@ -247,13 +227,14 @@ 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)"); - // Buffer overrun could replay pBuffer + /* Buffer overrun could replay pBuffer */ } - return(0); + return 0; } STATIC UcsXmlVal_t* ParseFile(struct afb_req request) { @@ -275,12 +256,12 @@ STATIC UcsXmlVal_t* ParseFile(struct afb_req request) { goto OnErrorExit; } - // read file into buffer as a \0 terminated string + /* read file into buffer as a \0 terminated string */ fstat(fdHandle, &fdStat); xmlBuffer = (char*)alloca(fdStat.st_size + 1); readSize = read(fdHandle, xmlBuffer, fdStat.st_size); close(fdHandle); - xmlBuffer[readSize] = '\0'; //In any case, terminate it. + xmlBuffer[readSize] = '\0'; /* In any case, terminate it. */ if (readSize != fdStat.st_size) { afb_req_fail_f (request, "fileread-fail", "File to read fullfile '%s' size(%d!=%d)", filename, readSize, fdStat.st_size); @@ -308,7 +289,7 @@ STATIC int volOnSvcCB (sd_event_source* source,uint64_t timer, void* pTag) { return 0; } -// This callback is fire each time an volume event wait in the queue +/* This callback is fire each time an volume event wait in the queue */ void volumeCB (uint16_t timeout) { uint64_t usec; sd_event_now(afb_daemon_get_event_loop(afbIface->daemon), CLOCK_BOOTTIME, &usec); @@ -377,10 +358,10 @@ STATIC int volSndCmd (struct afb_req request, struct json_object *commandJ, ucsC } - // Fulup what's append when channel or vol are invalid ??? + /* Fulup what's append when channel or vol are invalid ??? */ err = UCSI_Vol_Set (&ucsContext->ucsiData, numid, (uint8_t) vol); if (err) { - // Fulup this might only be a warning (not sure about it) + /* Fulup this might only be a warning (not sure about it) */ afb_req_fail_f (request, "vol-refused","command=%s vol was refused by UNICENS", json_object_get_string (volJ)); goto OnErrorExit; } @@ -396,7 +377,7 @@ PUBLIC void ucs2SetVol (struct afb_req request) { struct json_object *queryJ; int err; - // check UNICENS is initialised + /* check UNICENS is initialised */ if (!ucsContextS) { afb_req_fail_f (request, "UNICENS-init","Should Load Config before using setvol"); goto OnErrorExit; @@ -442,40 +423,42 @@ PUBLIC void ucs2Init (struct afb_req request) { sd_event_source *evtSource; int err; - // Read and parse XML file + /* Read and parse XML file */ 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");