FlapJackApps/libdivecomputer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return only after all data has been read or written.

Browse Source 
And added a function to retrieve the number of bytes waiting in the 
receive buffer.
This commit is contained in:
Jef Driesen 2008-04-11 13:45:42 +00:00
parent 71a5c0ac3f
commit c2bc70e8a0
2 changed files with 56 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
irda.c
View File

@ -13,6 +13,7 @@
#include <linux/types.h> // irda #include <linux/types.h> // irda
#include <linux/irda.h> // irda #include <linux/irda.h> // irda
#include <sys/select.h> // select #include <sys/select.h> // select
#include <sys/ioctl.h> // ioctl
#endif #endif
#include "irda.h" #include "irda.h"
@ -347,6 +348,28 @@ irda_socket_connect_lsap (irda *device, unsigned int address, unsigned int lsap)
} }
int
irda_socket_available (irda* device)
{
if (device == NULL)
return -1; // EINVAL (Invalid argument)
#ifdef _WIN32
unsigned long bytes = 0;
if (ioctlsocket (device->fd, FIONREAD, &bytes) != 0) {
TRACE ("ioctlsocket");
#else
int bytes = 0;
if (ioctl (device->fd, FIONREAD, &bytes) != 0) {
TRACE ("ioctl");
#endif
return -1;
}
return bytes;
}
int int
irda_socket_read (irda* device, void* data, unsigned int size) irda_socket_read (irda* device, void* data, unsigned int size)
{ {
@ -362,21 +385,29 @@ irda_socket_read (irda* device, void* data, unsigned int size)
fd_set fds; fd_set fds;
FD_ZERO (&fds); FD_ZERO (&fds);
FD_SET (device->fd, &fds); FD_SET (device->fd, &fds);
int rc = select (device->fd + 1, &fds, NULL, NULL, (device->timeout >= 0 ? &tv : NULL));
if (rc < 0) { unsigned int nbytes = 0;
TRACE ("select"); while (nbytes < size) {
return -1; // Error. int rc = select (device->fd + 1, &fds, NULL, NULL, (device->timeout >= 0 ? &tv : NULL));
} else if (rc == 0) { if (rc < 0) {
return 0; // Timeout. TRACE ("select");
return -1; // Error during select call.
} else if (rc == 0) {
break; // Timeout.
}
int n = recv (device->fd, data + nbytes, size - nbytes, 0);
if (n < 0) {
TRACE ("recv");
return -1; // Error during recv call.
} else if (n == 0) {
break; // EOF reached.
}
nbytes += n;
} }
int n = recv (device->fd, data, size, 0); return nbytes;
if (n < 0) {
TRACE ("recv");
return -1;
}
return n;
} }
@ -386,11 +417,16 @@ irda_socket_write (irda* device, const void *data, unsigned int size)
if (device == NULL) if (device == NULL)
return -1; // EINVAL (Invalid argument) return -1; // EINVAL (Invalid argument)
int n = send (device->fd, data, size, 0); unsigned int nbytes = 0;
if (n < 0) { while (nbytes < size) {
TRACE ("send"); int n = send (device->fd, data + nbytes, size - nbytes, 0);
return -1; if (n < 0) {
TRACE ("send");
return -1; // Error during send call.
}
nbytes += n;
} }
return n; return nbytes;
} }

2
irda.h
View File

@ -28,6 +28,8 @@ int irda_socket_discover (irda *device, irda_callback_t callback, void *userdata
int irda_socket_connect_name (irda *device, unsigned int address, const char *name); int irda_socket_connect_name (irda *device, unsigned int address, const char *name);
int irda_socket_connect_lsap (irda *device, unsigned int address, unsigned int lsap); int irda_socket_connect_lsap (irda *device, unsigned int address, unsigned int lsap);
int irda_socket_available (irda* device);
int irda_socket_read (irda* device, void* data, unsigned int size); int irda_socket_read (irda* device, void* data, unsigned int size);
int irda_socket_write (irda* device, const void *data, unsigned int size); int irda_socket_write (irda* device, const void *data, unsigned int size);