BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ipdbg-la: working on windows

This commit is contained in:
danselmi 2019-01-17 12:31:23 +01:00 committed by Uwe Hermann
parent f6ce25ec05
commit c54ca32340
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/hardware/ipdbg-la/protocol.c
View File

@ -67,18 +67,15 @@ static gboolean data_available(struct ipdbg_la_tcp *tcp)
{ {
#ifdef _WIN32 #ifdef _WIN32
u_long bytes_available; u_long bytes_available;
ioctlsocket(tcp->socket, FIONREAD, &bytes_available); if(ioctlsocket(tcp->socket, FIONREAD, &bytes_available) != 0){
return (bytes_available > 0);
#else #else
int status; int bytes_available;
if (ioctl(tcp->socket, FIONREAD, &bytes_available) < 0){ // TIOCMGET
if (ioctl(tcp->socket, FIONREAD, &status) < 0) { // TIOCMGET #endif
sr_err("FIONREAD failed: %s\n", g_strerror(errno)); sr_err("FIONREAD failed: %s\n", g_strerror(errno));
return FALSE; return FALSE;
} }
return (bytes_available > 0);
return (status < 1) ? FALSE : TRUE;
#endif
} }
SR_PRIV struct ipdbg_la_tcp *ipdbg_la_tcp_new(void) SR_PRIV struct ipdbg_la_tcp *ipdbg_la_tcp_new(void)
@ -145,6 +142,15 @@ SR_PRIV int ipdbg_la_tcp_close(struct ipdbg_la_tcp *tcp)
{ {
int ret = SR_OK; int ret = SR_OK;
#ifdef _WIN32
if (shutdown(tcp->socket, SD_SEND) != SOCKET_ERROR)
{
char recvbuf[16];
int recvbuflen = 16;
// Receive until the peer closes the connection
while(recv(tcp->socket, recvbuf, recvbuflen, 0) > 0);
}
#endif
if (close(tcp->socket) < 0) if (close(tcp->socket) < 0)
ret = SR_ERR; ret = SR_ERR;