rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00
Code Issues Releases Activity

Remove old hacky windows USB packet handling crap

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1182 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
peabody124 2010-07-29 20:00:17 +00:00 committed by peabody124
parent 7ef89b6e21
commit 054e662882
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/src/plugins/rawhid/pjrc_rawhid_win.cpp
View File

@ -180,14 +180,14 @@ int pjrc_rawhid::receive(int num, void *buf, int len, int timeout)
OVERLAPPED ov;
DWORD n, r;
if (sizeof(tmpbuf) < len + 1) return -1;
if (sizeof(tmpbuf) < len) return -1;
hid = get_hid(num);
if (!hid || !hid->open) return -1;
EnterCriticalSection(&rx_mutex);
ResetEvent(&rx_event);
memset(&ov, 0, sizeof(ov));
ov.hEvent = rx_event;
if (!ReadFile(hid->handle, tmpbuf, len + 1, NULL, &ov)) {
if (!ReadFile(hid->handle, tmpbuf, len, NULL, &ov)) {
if (GetLastError() != ERROR_IO_PENDING) goto return_error;
r = WaitForSingleObject(rx_event, timeout);
if (r == WAIT_TIMEOUT) goto return_timeout;
@ -198,7 +198,7 @@ int pjrc_rawhid::receive(int num, void *buf, int len, int timeout)
if (n <= 0) return -1;
n--;
if (n > len) n = len;
memcpy(buf, tmpbuf + 1, n);
memcpy(buf, tmpbuf, n);
return n;
return_timeout:
CancelIo(hid->handle);