ln-dotnet
/
SOEM
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix return value of ecx_writestate

pull/25/head
Mikael Heden 2015-12-18 14:55:30 +01:00
parent d5fa11630d
commit 59e2164410
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
soem/ethercatmain.c
View File

@ -800,26 +800,29 @@ int ecx_readstate(ecx_contextt *context)
/** Write slave state, if slave = 0 then write to all slaves. /** Write slave state, if slave = 0 then write to all slaves.
* The function does not check if the actual state is changed. * The function does not check if the actual state is changed.
* @param[in] context = context struct * @param[in] context = context struct
* @param[in] slave = Slave number, 0 = master * @param[in] slave = Slave number, 0 = master
* @return 0 * @return Workcounter or EC_NOFRAME
*/ */
int ecx_writestate(ecx_contextt *context, uint16 slave) int ecx_writestate(ecx_contextt *context, uint16 slave)
{ {
int ret;
uint16 configadr, slstate; uint16 configadr, slstate;
if (slave == 0) if (slave == 0)
{ {
slstate = htoes(context->slavelist[slave].state); slstate = htoes(context->slavelist[slave].state);
ecx_BWR(context->port, 0, ECT_REG_ALCTL, sizeof(slstate), &slstate, EC_TIMEOUTRET3); /* write slave status */ ret = ecx_BWR(context->port, 0, ECT_REG_ALCTL, sizeof(slstate),
&slstate, EC_TIMEOUTRET3);
} }
else else
{ {
configadr = context->slavelist[slave].configadr; configadr = context->slavelist[slave].configadr;
ecx_FPWRw(context->port, configadr, ECT_REG_ALCTL, htoes(context->slavelist[slave].state), EC_TIMEOUTRET3); /* write slave status */ ret = ecx_FPWRw(context->port, configadr, ECT_REG_ALCTL,
htoes(context->slavelist[slave].state), EC_TIMEOUTRET3);
} }
return 0; return ret;
} }
/** Check actual slave state. /** Check actual slave state.