nikon/CANopenNode
1
0
Fork 0
Code Activity Actions

CO_LSSmaster: style changed , add space on if condition

Browse source
This commit is contained in:
temi54c1l8 2024-06-13 16:21:12 +02:00
parent 22fe7b9bc6
commit 79aa366627
1 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
305/CO_LSSmaster.c
View file

@ -84,7 +84,7 @@ static void CO_LSSmaster_receive(void *object, void *msg)
/* verify message length and message overflow (previous message was not processed yet) */
if((DLC==8U) && !CO_FLAG_READ(LSSmaster->CANrxNew) &&
(LSSmaster->command!=CO_LSSmaster_COMMAND_WAITING)){
(LSSmaster->command != CO_LSSmaster_COMMAND_WAITING)){
/* copy data and set 'new message' flag */
(void)memcpy(LSSmaster->CANrxData, data, sizeof(LSSmaster->CANrxData));
@ -137,7 +137,7 @@ CO_ReturnError_t CO_LSSmaster_init(
CO_ReturnError_t ret = CO_ERROR_NO;
/* verify arguments */
if ((LSSmaster==NULL) || (CANdevRx==NULL) || (CANdevTx==NULL)){
if ((LSSmaster == NULL) || (CANdevRx == NULL) || (CANdevTx == NULL)){
return CO_ERROR_ILLEGAL_ARGUMENT;
}
@ -295,8 +295,8 @@ CO_LSSmaster_return_t CO_LSSmaster_switchStateSelect(
}
/* Initiate select */
if ((LSSmaster->state==CO_LSSmaster_STATE_WAITING) &&
(LSSmaster->command==CO_LSSmaster_COMMAND_WAITING)){
if ((LSSmaster->state == CO_LSSmaster_STATE_WAITING) &&
(LSSmaster->command == CO_LSSmaster_COMMAND_WAITING)){
ret = CO_LSSmaster_switchStateSelectInitiate(LSSmaster, lssAddress);
}
@ -306,7 +306,7 @@ CO_LSSmaster_return_t CO_LSSmaster_switchStateSelect(
}
else { /* MISRA C 2004 14.10 */ }
if ((ret!=CO_LSSmaster_INVALID_STATE) && (ret!=CO_LSSmaster_WAIT_SLAVE)) {
if ((ret != CO_LSSmaster_INVALID_STATE) && (ret != CO_LSSmaster_WAIT_SLAVE)) {
/* finished */
LSSmaster->command = CO_LSSmaster_COMMAND_WAITING;
}
@ -398,7 +398,7 @@ static CO_LSSmaster_return_t CO_LSSmaster_configureCheckWait(
ret = CO_LSSmaster_check_timeout(LSSmaster, timeDifference_us);
}
if ((ret!=CO_LSSmaster_INVALID_STATE) && (ret!=CO_LSSmaster_WAIT_SLAVE)) {
if ((ret != CO_LSSmaster_INVALID_STATE) && (ret != CO_LSSmaster_WAIT_SLAVE)) {
/* finished */
LSSmaster->command = CO_LSSmaster_COMMAND_WAITING;
}
@ -433,8 +433,8 @@ CO_LSSmaster_return_t CO_LSSmaster_configureBitTiming(
}
/* Initiate config bit */
if ((LSSmaster->state==CO_LSSmaster_STATE_CFG_SLECTIVE) &&
(LSSmaster->command==CO_LSSmaster_COMMAND_WAITING)){
if ((LSSmaster->state == CO_LSSmaster_STATE_CFG_SLECTIVE) &&
(LSSmaster->command == CO_LSSmaster_COMMAND_WAITING)){
LSSmaster->command = CO_LSSmaster_COMMAND_CFG_BIT_TIMING;
LSSmaster->timeoutTimer = 0;
@ -456,7 +456,7 @@ CO_LSSmaster_return_t CO_LSSmaster_configureBitTiming(
}
else { /* MISRA C 2004 14.10 */ }
if ((ret!=CO_LSSmaster_INVALID_STATE) && (ret!=CO_LSSmaster_WAIT_SLAVE)) {
if ((ret != CO_LSSmaster_INVALID_STATE) && (ret != CO_LSSmaster_WAIT_SLAVE)) {
/* finished */
LSSmaster->command = CO_LSSmaster_COMMAND_WAITING;
}
@ -472,16 +472,16 @@ CO_LSSmaster_return_t CO_LSSmaster_configureNodeId(
{
CO_LSSmaster_return_t ret = CO_LSSmaster_INVALID_STATE;
if ((LSSmaster==NULL) || !CO_LSS_NODE_ID_VALID(nodeId)){
if ((LSSmaster == NULL) || !CO_LSS_NODE_ID_VALID(nodeId)){
return CO_LSSmaster_ILLEGAL_ARGUMENT;
}
/* Initiate config node ID */
if (((LSSmaster->state==CO_LSSmaster_STATE_CFG_SLECTIVE) ||
if (((LSSmaster->state == CO_LSSmaster_STATE_CFG_SLECTIVE) ||
/* Let un-config node ID also be run in global mode for unconfiguring all nodes */
((LSSmaster->state==CO_LSSmaster_STATE_CFG_GLOBAL) &&
((LSSmaster->state == CO_LSSmaster_STATE_CFG_GLOBAL) &&
(nodeId == CO_LSS_NODE_ID_ASSIGNMENT))) &&
(LSSmaster->command==CO_LSSmaster_COMMAND_WAITING)) {
(LSSmaster->command == CO_LSSmaster_COMMAND_WAITING)) {
LSSmaster->command = CO_LSSmaster_COMMAND_CFG_NODE_ID;
LSSmaster->timeoutTimer = 0;
@ -502,7 +502,7 @@ CO_LSSmaster_return_t CO_LSSmaster_configureNodeId(
}
else { /* MISRA C 2004 14.10 */ }
if ((ret!=CO_LSSmaster_INVALID_STATE) && (ret!=CO_LSSmaster_WAIT_SLAVE)) {
if ((ret != CO_LSSmaster_INVALID_STATE) && (ret != CO_LSSmaster_WAIT_SLAVE)) {
/* finished */
LSSmaster->command = CO_LSSmaster_COMMAND_WAITING;
}
@ -522,8 +522,8 @@ CO_LSSmaster_return_t CO_LSSmaster_configureStore(
}
/* Initiate config store */
if ((LSSmaster->state==CO_LSSmaster_STATE_CFG_SLECTIVE) &&
(LSSmaster->command==CO_LSSmaster_COMMAND_WAITING)){
if ((LSSmaster->state == CO_LSSmaster_STATE_CFG_SLECTIVE) &&
(LSSmaster->command == CO_LSSmaster_COMMAND_WAITING)){
LSSmaster->command = CO_LSSmaster_COMMAND_CFG_STORE;
LSSmaster->timeoutTimer = 0;
@ -543,7 +543,7 @@ CO_LSSmaster_return_t CO_LSSmaster_configureStore(
}
else { /* MISRA C 2004 14.10 */ }
if ((ret!=CO_LSSmaster_INVALID_STATE) && (ret!=CO_LSSmaster_WAIT_SLAVE)) {
if ((ret != CO_LSSmaster_INVALID_STATE) && (ret != CO_LSSmaster_WAIT_SLAVE)) {
/* finished */
LSSmaster->command = CO_LSSmaster_COMMAND_WAITING;
}
@ -564,8 +564,8 @@ CO_LSSmaster_return_t CO_LSSmaster_ActivateBit(
/* for activating bit timing, we need to have all slaves set to config
* state. This check makes it a bit harder to shoot ourselves in the foot */
if ((LSSmaster->state==CO_LSSmaster_STATE_CFG_GLOBAL) &&
(LSSmaster->command==CO_LSSmaster_COMMAND_WAITING)){
if ((LSSmaster->state == CO_LSSmaster_STATE_CFG_GLOBAL) &&
(LSSmaster->command == CO_LSSmaster_COMMAND_WAITING)){
CO_FLAG_CLEAR(LSSmaster->CANrxNew);
LSSmaster->TXbuff->data[0] = CO_LSS_CFG_ACTIVATE_BIT_TIMING;
@ -634,7 +634,7 @@ CO_LSSmaster_return_t CO_LSSmaster_InquireLssAddress(
CO_LSSmaster_return_t ret = CO_LSSmaster_INVALID_STATE;
CO_LSSmaster_command_t next = CO_LSSmaster_COMMAND_WAITING;
if ((LSSmaster==NULL) || (lssAddress==NULL)){
if ((LSSmaster == NULL) || (lssAddress == NULL)){
return CO_LSSmaster_ILLEGAL_ARGUMENT;
}
@ -707,7 +707,7 @@ CO_LSSmaster_return_t CO_LSSmaster_InquireLssAddress(
else { /* MISRA C 2004 14.10 */ }
}
if ((ret!=CO_LSSmaster_INVALID_STATE) && (ret!=CO_LSSmaster_WAIT_SLAVE)) {
if ((ret != CO_LSSmaster_INVALID_STATE) && (ret != CO_LSSmaster_WAIT_SLAVE)) {
/* finished */
LSSmaster->command = CO_LSSmaster_COMMAND_WAITING;
}
@ -724,13 +724,13 @@ CO_LSSmaster_return_t CO_LSSmaster_Inquire(
{
CO_LSSmaster_return_t ret = CO_LSSmaster_INVALID_STATE;
if ((LSSmaster==NULL) || (value==NULL)){
if ((LSSmaster == NULL) || (value == NULL)){
return CO_LSSmaster_ILLEGAL_ARGUMENT;
}
/* send request */
if (((LSSmaster->state==CO_LSSmaster_STATE_CFG_SLECTIVE) ||
(LSSmaster->state==CO_LSSmaster_STATE_CFG_GLOBAL)) &&
if (((LSSmaster->state == CO_LSSmaster_STATE_CFG_SLECTIVE) ||
(LSSmaster->state == CO_LSSmaster_STATE_CFG_GLOBAL)) &&
(LSSmaster->command == CO_LSSmaster_COMMAND_WAITING)) {
LSSmaster->command = CO_LSSmaster_COMMAND_INQUIRE;
@ -1001,7 +1001,7 @@ CO_LSSmaster_return_t CO_LSSmaster_IdentifyFastscan(
CO_LSS_fastscan_lss_sub_next next;
/* parameter validation */
if ((LSSmaster==NULL) || (fastscan==NULL)){
if ((LSSmaster == NULL) || (fastscan == NULL)){
return CO_LSSmaster_ILLEGAL_ARGUMENT;
}
if (fastscan->scan[0] == CO_LSSmaster_FS_SKIP) {
@ -1020,9 +1020,9 @@ CO_LSSmaster_return_t CO_LSSmaster_IdentifyFastscan(
}
/* state machine validation */
if ((LSSmaster->state!=CO_LSSmaster_STATE_WAITING) ||
((LSSmaster->command!=CO_LSSmaster_COMMAND_WAITING) &&
(LSSmaster->command!=CO_LSSmaster_COMMAND_IDENTIFY_FASTSCAN))) {
if ((LSSmaster->state != CO_LSSmaster_STATE_WAITING) ||
((LSSmaster->command != CO_LSSmaster_COMMAND_WAITING) &&
(LSSmaster->command != CO_LSSmaster_COMMAND_IDENTIFY_FASTSCAN))) {
/* state machine not ready, other command is already processed */
return CO_LSSmaster_INVALID_STATE;
}