ln-dotnet
/
SOES
mirror of https://github.com/OpenEtherCATsociety/SOES.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #58 from elsp1991/bug/fi_foe_read_supported_build 

fix build fail when FOE_READ_SUPPORTED is defined
pull/67/head
nakarlsson 2019-06-26 08:31:15 +02:00 committed by GitHub
parent b46bb0ab0e 576624fd70
commit 0f2959be46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
soes/esc_foe.c
View File

@ -118,7 +118,7 @@ uint16_t FOE_fread (uint8_t * data, uint16_t maxlength)
while (maxlength && (FOEvar.fend - FOEvar.fposition))
{
maxlength--;
*(data++) = fbuffer[FOEvar.fposition++];
*(data++) = foe_cfg->fbuffer[FOEvar.fposition++];
ncopied++;
}
@ -245,11 +245,11 @@ int FOE_send_data_packet ()
if (mbxhandle)
{
foembx = (_FOE *) &MBX[mbxhandle * ESC_MBXSIZE];
data_len = FOE_fread (foembx->data, FOE_DATA_SIZE);
data_len = FOE_fread (foembx->data, ESC_FOE_DATA_SIZE);
foembx->foeheader.opcode = FOE_OP_DATA;
foembx->foeheader.packetnumber = htoel (FOEvar.foepacket);
FOEvar.foepacket++;
foembx->mbxheader.length = htoes (data_len + FOEHSIZE);
foembx->mbxheader.length = htoes (data_len + ESC_FOEHSIZE);
foembx->mbxheader.mbxtype = MBXFOE;
/* Mark the outbound mailbox as filled. */
MBXcontrol[mbxhandle].state = MBXstate_outreq;
@ -315,7 +315,7 @@ void FOE_read ()
FOE_init ();
foembx = (_FOE *) &MBX[0];
/* Get the length of the file name in octets. */
data_len = etohs (foembx->mbxheader.length) - FOEHSIZE;
data_len = etohs (foembx->mbxheader.length) - ESC_FOEHSIZE;
password = etohl (foembx->foeheader.password);
res = FOE_fopen (foembx->filename, data_len, password, FOE_OP_RRQ);
@ -326,7 +326,7 @@ void FOE_read ()
* Attempt to send the packet
*/
res = FOE_send_data_packet ();
if (res <= (int)FOE_DATA_SIZE)
if (res <= (int)ESC_FOE_DATA_SIZE)
{
FOEvar.foestate = FOE_WAIT_FOR_ACK;
}
@ -368,7 +368,7 @@ void FOE_ack ()
return;
}
res = FOE_send_data_packet ();
if (res < (int) FOE_DATA_SIZE)
if (res < (int)ESC_FOE_DATA_SIZE)
{
FOEvar.foestate = FOE_WAIT_FOR_FINAL_ACK;
}