X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=libaltos%2Flibaltos.c;h=4a6363edc7a069c4e0f83d930d24d9d7bdea4b2c;hp=69a6735f50e72febc28db62726d9f80760d2a8f7;hb=6545a72012e94a50d185e1c4ecff3c3769d60acd;hpb=02a564bbc3a23b4f90685e8b29083ddb3e4b3563

diff --git a/libaltos/libaltos.c b/libaltos/libaltos.c
index 69a6735f..4a6363ed 100644
--- a/libaltos/libaltos.c
+++ b/libaltos/libaltos.c
@@ -765,6 +765,7 @@ altos_bt_open(struct altos_bt_device *device)
 		altos_set_last_posix_error();
 		goto no_link;
 	}
+	usleep(100 * 1000);
 
 #ifdef USE_POLL
 	pipe(file->pipe);
@@ -993,6 +994,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);
@@ -1338,6 +1344,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);
 	}
 	
@@ -1372,13 +1379,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);
 	}
 }