From 994087c0b9172a6ecfcae89da7ab9e0cdd8a08e8 Mon Sep 17 00:00:00 2001 From: Claudiu Olteanu Date: Tue, 18 Aug 2015 21:38:17 +0300 Subject: Add implementation for BTH custom serial read method used on Windows Implement the read method used for our custom serial implementation on Windows platforms. Signed-off-by: Claudiu Olteanu Signed-off-by: Dirk Hohndel --- qtserialbluetooth.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/qtserialbluetooth.cpp b/qtserialbluetooth.cpp index 20f2ecd5d..9d1c14b74 100644 --- a/qtserialbluetooth.cpp +++ b/qtserialbluetooth.cpp @@ -209,9 +209,22 @@ static int qt_serial_read(serial_t *device, void* data, unsigned int size) if (device == NULL) return DC_STATUS_INVALIDARGS; - // TODO read *size* bytes from the device + unsigned int nbytes = 0; + int rc; - return 0; + while (nbytes < size) { + rc = recv (device->socket, (char *) data + nbytes, size - nbytes, 0); + + if (rc < 0) { + return -1; // Error during recv call. + } else if (rc == 0) { + break; // EOF reached. + } + + nbytes += rc; + } + + return nbytes; #else if (device == NULL || device->socket == NULL) return DC_STATUS_INVALIDARGS; -- cgit v1.2.3-70-g09d2