diff options
| -rw-r--r-- | ucs2-interface/ucs_config.h | 4 | ||||
| -rw-r--r-- | ucs2-interface/ucs_interface.h | 2 | ||||
| -rw-r--r-- | ucs2-interface/ucs_lib_interf.c | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/ucs2-interface/ucs_config.h b/ucs2-interface/ucs_config.h index 0a47ae4..1f1ecdd 100644 --- a/ucs2-interface/ucs_config.h +++ b/ucs2-interface/ucs_config.h @@ -143,10 +143,10 @@ typedef struct uint16_t timeout; uint8_t dataLen; uint8_t data[I2C_WRITE_MAX_LEN]; - + Ucsi_ResultCb_t result_fptr; void *request_ptr; - + } UnicensCmdI2CWrite_t; /** diff --git a/ucs2-interface/ucs_interface.h b/ucs2-interface/ucs_interface.h index d7a1f66..ec160eb 100644 --- a/ucs2-interface/ucs_interface.h +++ b/ucs2-interface/ucs_interface.h @@ -150,7 +150,7 @@ void UCSI_ReleaseAmsMessage(UCSI_Data_t *my); * \param pPriv - private data section of this instance * \param routeId - identifier as given in XML file along with MOST socket (unique) * \param isActive - true, route will become active. false, route will be deallocated - * + * * \return true, if route was found and the specific command was enqueued to UNICENS. */ bool UCSI_SetRouteActive(UCSI_Data_t *pPriv, uint16_t routeId, bool isActive); diff --git a/ucs2-interface/ucs_lib_interf.c b/ucs2-interface/ucs_lib_interf.c index 58b49d9..c851883 100644 --- a/ucs2-interface/ucs_lib_interf.c +++ b/ucs2-interface/ucs_lib_interf.c @@ -220,7 +220,7 @@ void UCSI_Service(UCSI_Data_t *my) UCSI_CB_OnUserMessage(my->tag, true, "UnicensCmd_GpioWritePort failed", 0); break; case UnicensCmd_I2CWrite: - ret = Ucs_I2c_WritePort(my->unicens, e->val.I2CWrite.destination, 0x0F00, + ret = Ucs_I2c_WritePort(my->unicens, e->val.I2CWrite.destination, 0x0F00, (e->val.I2CWrite.isBurst ? UCS_I2C_BURST_MODE : UCS_I2C_DEFAULT_MODE), e->val.I2CWrite.blockCount, e->val.I2CWrite.slaveAddr, e->val.I2CWrite.timeout, e->val.I2CWrite.dataLen, e->val.I2CWrite.data, OnUcsI2CWrite); if (UCS_RET_SUCCESS == ret) @@ -314,7 +314,7 @@ bool UCSI_SetRouteActive(UCSI_Data_t *my, uint16_t routeId, bool isActive) } bool UCSI_I2CWrite(UCSI_Data_t *my, uint16_t targetAddress, bool isBurst, uint8_t blockCount, - uint8_t slaveAddr, uint16_t timeout, uint8_t dataLen, uint8_t *pData, + uint8_t slaveAddr, uint16_t timeout, uint8_t dataLen, uint8_t *pData, Ucsi_ResultCb_t result_fptr, void *request_ptr) { UnicensCmdEntry_t entry; @@ -786,7 +786,7 @@ static void OnUcsMgrReport(Ucs_MgrReport_t code, uint16_t node_address, Ucs_Rm_N UCSI_CB_OnUserMessage(my->tag, true, "Node=%X: unknown code", 1, node_address); break; } - + UCSI_CB_OnMgrReport(my->tag, code, node_address, node_ptr); } @@ -833,16 +833,16 @@ static void OnUcsI2CWrite(uint16_t node_address, uint16_t i2c_port_handle, { UCSI_Data_t *my = (UCSI_Data_t *)user_ptr; assert(MAGIC == my->magic); - - if ((my->currentCmd->cmd == UnicensCmd_I2CWrite) + + if ((my->currentCmd->cmd == UnicensCmd_I2CWrite) && (my->currentCmd->val.I2CWrite.result_fptr)) { - + my->currentCmd->val.I2CWrite.result_fptr(&result.code, my->currentCmd->val.I2CWrite.request_ptr); } else { assert(false); } - + OnCommandExecuted(my, UnicensCmd_I2CWrite); if (UCS_I2C_RES_SUCCESS != result.code) UCSI_CB_OnUserMessage(my->tag, true, "Remote I2C Write to node=0x%X failed", 1, node_address); |