MirrorSave
/
pigpio
mirror of https://github.com/joan2937/pigpio
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix network communication on arm64 - continued 

The 55d8b880fc commit on the original pigpio repo fixed parsing data received from a socket on 64bit systems.
This one fixes also the response that is being sent back to the socket - 64bit array is translated back to a 32bit array that is passed to the send function.
This commit is contained in:
PB 2019-08-16 10:26:05 +02:00
parent b6fe587451
commit d1f3bc81d9
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pigpio.c
View File

@ -6953,7 +6953,8 @@ static void *pthSocketThreadHandler(void *fdC)
{ {
int sock = *(int*)fdC; int sock = *(int*)fdC;
uintptr_t p[10]; uintptr_t p[10];
uint32_t tmp; uint32_t tmp, response[4];
int i;
int opt; int opt;
char buf[CMD_MAX_EXTENSION]; char buf[CMD_MAX_EXTENSION];
@ -7043,7 +7044,16 @@ static void *pthSocketThreadHandler(void *fdC)
p[3] = myDoCommand(p, sizeof(buf)-1, buf); p[3] = myDoCommand(p, sizeof(buf)-1, buf);
} }
if (write(sock, p, 16) == -1) { /* ignore errors */ } if (sizeof(uintptr_t) == 8) // 64-bit system
{
for (i = 0; i < 4; i++)
response[i] = (uint32_t)p[i];
if (write(sock, response, 16) == -1) { /* ignore errors */ }
}
else // 32-bit system
{
if (write(sock, p, 16) == -1) { /* ignore errors */ }
}
switch (p[0]) switch (p[0])
{ {