X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=libaltos%2Flibaltos.c;h=a623d5ae0b5c187f9b0c5a7bec962b1c73e2451d;hp=fc949c7020a2e8143f5c5f83238ebda3cb4b1003;hb=c0966cd40f05f3a65b0c977b4b92586a58192f4b;hpb=2e28d3541b8da31ebef5a199baf8f544d238298e

diff --git a/libaltos/libaltos.c b/libaltos/libaltos.c
index fc949c70..a623d5ae 100644
--- a/libaltos/libaltos.c
+++ b/libaltos/libaltos.c
@@ -53,6 +53,8 @@ altos_get_last_error(struct altos_error *error)
 
 #ifdef DARWIN
 
+#include <unistd.h>
+
 #undef USE_POLL
 
 /* Mac OS X don't have strndup even if _GNU_SOURCE is defined */
@@ -887,15 +889,6 @@ altos_list_next(struct altos_list *list, struct altos_device *device)
 		if (!get_number (object, CFSTR(kUSBVendorID), &device->vendor) ||
 		    !get_number (object, CFSTR(kUSBProductID), &device->product))
 			continue;
-		if (list->ftdi) {
-			if (device->vendor != 0x0403)
-				continue;
-		} else {
-			if (device->vendor != 0xfffe)
-				continue;
-			if (device->product < 0x000a || 0x0013 < device->product)
-				continue;
-		}
 		if (get_string (object, CFSTR("IOCalloutDevice"), device->path, sizeof (device->path)) &&
 		    get_string (object, CFSTR("USB Product Name"), device->name, sizeof (device->name)) &&
 		    get_string (object, CFSTR("USB Serial Number"), serial_string, sizeof (serial_string))) {
@@ -994,6 +987,11 @@ log_message(char *fmt, ...)
 	if (!log)
 		log = fopen("\\temp\\altos.txt", "w");
 	if (log) {
+		SYSTEMTIME time;
+		GetLocalTime(&time);
+		fprintf (log, "%4d-%02d-%02d %2d:%02d:%02d. ", 
+			 time.wYear, time.wMonth, time.wDay,
+			 time.wHour, time.wMinute, time.wSecond);
 		va_start(a, fmt);
 		vfprintf(log, fmt, a);
 		va_end(a);
@@ -1339,6 +1337,7 @@ altos_open(struct altos_device *device)
 		file->handle = open_serial(full_name);
 		if (file->handle != INVALID_HANDLE_VALUE)
 			break;
+		altos_set_last_windows_error();
 		Sleep(100);
 	}
 	
@@ -1373,13 +1372,19 @@ altos_open(struct altos_device *device)
 PUBLIC void
 altos_close(struct altos_file *file)
 {
-	if (file->handle != INVALID_HANDLE_VALUE) {
-		CloseHandle(file->handle);
+	HANDLE	handle = file->handle;
+	if (handle != INVALID_HANDLE_VALUE) {
+		HANDLE	ov_read = file->ov_read.hEvent;
+		HANDLE	ov_write = file->ov_write.hEvent;
+		file->handle = INVALID_HANDLE_VALUE;
+		file->ov_read.hEvent = INVALID_HANDLE_VALUE;
+		file->ov_write.hEvent = INVALID_HANDLE_VALUE;
+		PurgeComm(handle, PURGE_RXABORT|PURGE_RXCLEAR|PURGE_TXABORT|PURGE_TXCLEAR);
+		Sleep(100);
+		CloseHandle(handle);
 		file->handle = INVALID_HANDLE_VALUE;
-		SetEvent(file->ov_read.hEvent);
-		SetEvent(file->ov_write.hEvent);
-		CloseHandle(file->ov_read.hEvent);
-		CloseHandle(file->ov_write.hEvent);
+		CloseHandle(ov_read);
+		CloseHandle(ov_write);
 	}
 }