* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <config.h>
-#include "libserialport.h"
#include "libserialport_internal.h"
static const struct std_baudrate std_baudrates[] = {
#ifndef NO_PORT_METADATA
enum sp_return ret;
#endif
- int len;
+ size_t len;
TRACE("%s, %p", portname, port_ptr);
const char *portname)
{
void *tmp;
- unsigned int count;
+ size_t count;
for (count = 0; list[count]; count++)
;
if (flags & SP_MODE_WRITE)
desired_access |= GENERIC_WRITE;
- port->hdl = CreateFile(escaped_port_name, desired_access, 0, 0,
+ port->hdl = CreateFileA(escaped_port_name, desired_access, 0, 0,
OPEN_EXISTING, flags_and_attributes, 0);
free(escaped_port_name);
RETURN_INT(0);
#ifdef _WIN32
- DWORD remaining_ms, write_size, bytes_written, total_bytes_written = 0;
+ DWORD remaining_ms, write_size, bytes_written;
+ size_t remaining_bytes, total_bytes_written = 0;
const uint8_t *write_ptr = (uint8_t *) buf;
bool result;
struct timeout timeout;
}
/* Reduce write size if it exceeds the WriteFile limit. */
- write_size = count - total_bytes_written;
- if (write_size > WRITEFILE_MAX_SIZE)
+ remaining_bytes = count - total_bytes_written;
+ if (remaining_bytes > WRITEFILE_MAX_SIZE)
write_size = WRITEFILE_MAX_SIZE;
+ else
+ write_size = (DWORD) remaining_bytes;
/* Start write. */
total_bytes_written += bytes_written;
}
- RETURN_INT(total_bytes_written);
+ RETURN_INT((int) total_bytes_written);
#else
size_t bytes_written = 0;
unsigned char *ptr = (unsigned char *) buf;
RETURN_INT(0);
#ifdef _WIN32
- DWORD buf_bytes;
+ size_t buf_bytes;
/* Check whether previous write is complete. */
if (port->writing) {
memcpy(port->write_buf, buf, buf_bytes);
/* Start asynchronous write. */
- if (WriteFile(port->hdl, port->write_buf, buf_bytes, NULL, &port->write_ovl) == 0) {
+ if (WriteFile(port->hdl, port->write_buf, (DWORD) buf_bytes, NULL, &port->write_ovl) == 0) {
if (GetLastError() == ERROR_IO_PENDING) {
if ((port->writing = !HasOverlappedIoCompleted(&port->write_ovl)))
DEBUG("Asynchronous write completed immediately");
DEBUG("All bytes written immediately");
- RETURN_INT(buf_bytes);
+ RETURN_INT((int) buf_bytes);
#else
/* Returns the number of bytes written, or -1 upon failure. */
ssize_t written = write(port->fd, buf, count);
RETURN_INT(0);
#ifdef _WIN32
- DWORD bytes_read = 0;
+ DWORD bytes_read;
/* Set timeout. */
if (port->timeouts.ReadIntervalTimeout != 0 ||
}
/* Start read. */
- if (ReadFile(port->hdl, buf, count, NULL, &port->read_ovl)) {
+ if (ReadFile(port->hdl, buf, (DWORD) count, NULL, &port->read_ovl)) {
DEBUG("Read completed immediately");
- bytes_read = count;
+ bytes_read = (DWORD) count;
} else if (GetLastError() == ERROR_IO_PENDING) {
DEBUG("Waiting for read to complete");
if (GetOverlappedResult(port->hdl, &port->read_ovl, &bytes_read, TRUE) == 0)
TRY(restart_wait_if_needed(port, bytes_read));
- RETURN_INT(bytes_read);
+ RETURN_INT((int) bytes_read);
#else
size_t bytes_read = 0;
/* Loop until we have at least one byte, or timeout is reached. */
while (bytes_read == 0) {
/* Start read. */
- if (ReadFile(port->hdl, buf, count, &bytes_read, &port->read_ovl)) {
+ if (ReadFile(port->hdl, buf, (DWORD) count, &bytes_read, &port->read_ovl)) {
DEBUG("Read completed immediately");
} else if (GetLastError() == ERROR_IO_PENDING) {
DEBUG("Waiting for read to complete");
}
/* Do read. */
- if (ReadFile(port->hdl, buf, count, NULL, &port->read_ovl) == 0)
+ if (ReadFile(port->hdl, buf, (DWORD) count, NULL, &port->read_ovl) == 0)
if (GetLastError() != ERROR_IO_PENDING)
RETURN_FAIL("ReadFile() failed");
{
TRACE("%p", port);
+#ifdef __CYGWIN__
+ /* TIOCOUTQ is not defined in Cygwin headers */
+ RETURN_ERROR(SP_ERR_SUPP,
+ "Getting output bytes waiting is not supported on Cygwin");
+#else
CHECK_OPEN_PORT();
DEBUG_FMT("Checking output bytes waiting on port %s", port->name);
RETURN_FAIL("TIOCOUTQ ioctl failed");
RETURN_INT(bytes_waiting);
#endif
+#endif
}
SP_API enum sp_return sp_new_event_set(struct sp_event_set **result_ptr)
RETURN_OK();
#else
struct timeout timeout;
+ int poll_timeout;
int result;
struct pollfd *pollfds;
unsigned int i;
break;
}
- result = poll(pollfds, event_set->count, timeout_remaining_ms(&timeout) || -1);
+ poll_timeout = (int) timeout_remaining_ms(&timeout);
+ if (poll_timeout == 0)
+ poll_timeout = -1;
+
+ result = poll(pollfds, event_set->count, poll_timeout);
timeout_update(&timeout);
DEBUG_FMT("Setting configuration for port %s", port->name);
#ifdef _WIN32
+ BYTE* new_buf;
TRY(await_write_completion(port));
/* Allocate write buffer for 50ms of data at baud rate. */
port->write_buf_size = max(config->baudrate / (8 * 20), 1);
- port->write_buf = realloc(port->write_buf,
- port->write_buf_size);
-
- if (!port->write_buf)
+ new_buf = realloc(port->write_buf, port->write_buf_size);
+ if (!new_buf)
RETURN_ERROR(SP_ERR_MEM, "Allocating write buffer failed");
+ port->write_buf = new_buf;
}
if (config->bits >= 0)
TRACE_VOID();
#ifdef _WIN32
- TCHAR *message;
+ char *message;
DWORD error = GetLastError();
- DWORD length = FormatMessage(
+ DWORD length = FormatMessageA(
FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
NULL,
error,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPTSTR) &message,
+ (LPSTR) &message,
0, NULL );
if (length >= 2 && message[length - 2] == '\r')
projects / libserialport.git / blobdiff