# HG changeset patch # User 'Gr?gory Tr?lat ' # Date 1253880759 -7200 # Node ID 7767029937aa854dc313695504a9ff8bb872e845 # Parent 17a171fe7c56a509b7aa54f8b04b20a17939212f add timeout for waitreceivetaskend for the win32, fix GetLastError print diff -r 17a171fe7c56 -r 7767029937aa drivers/timers_win32/timers_win32.c --- a/drivers/timers_win32/timers_win32.c Thu Sep 24 10:03:07 2009 +0200 +++ b/drivers/timers_win32/timers_win32.c Fri Sep 25 14:12:39 2009 +0200 @@ -70,7 +70,10 @@ void WaitReceiveTaskEnd(TASK_HANDLE *Thread) { - WaitForSingleObject(*Thread, INFINITE); + if(WaitForSingleObject(*Thread, 1000) == WAIT_TIMEOUT) + { + TerminateThread(*Thread, -1); + } CloseHandle(*Thread); } diff -r 17a171fe7c56 -r 7767029937aa drivers/win32/win32.c --- a/drivers/win32/win32.c Thu Sep 24 10:03:07 2009 +0200 +++ b/drivers/win32/win32.c Fri Sep 25 14:12:39 2009 +0200 @@ -103,7 +103,7 @@ if (!handle) { - fprintf (stderr, "%s\n", GetLastError()); + fprintf (stderr, "%d\n", GetLastError()); return NULL; } @@ -181,7 +181,7 @@ /***************************************************************************/ int canClose(CO_Data * d) { - UNS8 res; + UNS8 res = 1; CANPort* tmp; if((CANPort*)d->canHandle)