From 9ad170c63ddac17301566e69fe6a0e7a8d0d4639 Mon Sep 17 00:00:00 2001 From: Marti Bolivar Date: Mon, 2 May 2011 14:35:58 -0400 Subject: Fixing USBSerial::read(void*, uint32). --- wirish/usb_serial.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'wirish') diff --git a/wirish/usb_serial.cpp b/wirish/usb_serial.cpp index e2cdee3..e2751a2 100644 --- a/wirish/usb_serial.cpp +++ b/wirish/usb_serial.cpp @@ -103,18 +103,18 @@ uint32 USBSerial::available(void) { /* blocks forever until len_bytes is received */ uint32 USBSerial::read(void *buf, uint32 len) { - if (!buf) { + if (buf == 0) { return 0; } uint32 bytes_in = 0; while (len > 0) { - uint32 new_bytes = usbReceiveBytes((uint8*)((uint8*)buf+bytes_in), len); + uint32 new_bytes = usbReceiveBytes((uint8*)buf + bytes_in, len); len -= new_bytes; bytes_in += new_bytes; } - return len; + return bytes_in; } /* blocks forever until 1 byte is received */ -- cgit v1.2.3