X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2Flibaltos%2Flibaltos.c;h=ab6ca87887c87b69675890e8f87f6e55afb4d4bf;hb=6e0d672b8a516a604d8ea1abd2bed113c608143f;hp=2c47f3e531f2b55d975a7a261193cafb17eb6a42;hpb=17f38e045fcd8ca0224095c0b2b7b098df77a8d8;p=fw%2Faltos

diff --git a/altosui/libaltos/libaltos.c b/altosui/libaltos/libaltos.c
index 2c47f3e5..ab6ca878 100644
--- a/altosui/libaltos/libaltos.c
+++ b/altosui/libaltos/libaltos.c
@@ -20,6 +20,18 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define USB_VENDOR_FSF			0xfffe
+#define USB_VENDOR_ALTUSMETRUM		USB_VENDOR_FSF
+#define USB_PRODUCT_ALTUSMETRUM		0x000a
+#define USB_PRODUCT_ALTUSMETRUM_MIN	0x000a
+#define USB_PRODUCT_ALTUSMETRUM_MAX	0x00ff
+
+#define USB_IS_ALTUSMETRUM(v,p)	((v) == USB_VENDOR_ALTUSMETRUM && \
+		(USB_PRODUCT_ALTUSMETRUM_MIN <= (p) && \
+		 (p) <= USB_PRODUCT_ALTUSMETRUM_MAX))
+
+#define BLUETOOTH_PRODUCT_TELEBT	"TeleBT"
+
 #define USE_POLL
 
 PUBLIC int
@@ -33,6 +45,22 @@ altos_fini(void)
 {
 }
 
+static struct altos_error last_error;
+
+static void
+altos_set_last_error(int code, char *string)
+{
+	last_error.code = code;
+	strncpy(last_error.string, string, sizeof (last_error.string) -1);
+	last_error.string[sizeof(last_error.string)-1] = '\0';
+}
+
+PUBLIC void
+altos_get_last_error(struct altos_error *error)
+{
+	*error = last_error;
+}
+
 #ifdef DARWIN
 
 #undef USE_POLL
@@ -80,6 +108,12 @@ struct altos_file {
 	int				in_read;
 };
 
+static void
+altos_set_last_posix_error(void)
+{
+	altos_set_last_error(errno, strerror(errno));
+}
+
 PUBLIC struct altos_file *
 altos_open(struct altos_device *device)
 {
@@ -87,12 +121,18 @@ altos_open(struct altos_device *device)
 	int			ret;
 	struct termios		term;
 
-	if (!file)
+	if (!file) {
+		altos_set_last_posix_error();
 		return NULL;
+	}
+
+//	altos_set_last_error(12, "yeah yeah, failed again");
+//	free(file);
+//	return NULL;
 
 	file->fd = open(device->path, O_RDWR | O_NOCTTY);
 	if (file->fd < 0) {
-		perror(device->path);
+		altos_set_last_posix_error();
 		free(file);
 		return NULL;
 	}
@@ -101,7 +141,7 @@ altos_open(struct altos_device *device)
 #else
 	file->out_fd = open(device->path, O_RDWR | O_NOCTTY);
 	if (file->out_fd < 0) {
-		perror(device->path);
+		altos_set_last_posix_error();
 		close(file->fd);
 		free(file);
 		return NULL;
@@ -109,7 +149,7 @@ altos_open(struct altos_device *device)
 #endif
 	ret = tcgetattr(file->fd, &term);
 	if (ret < 0) {
-		perror("tcgetattr");
+		altos_set_last_posix_error();
 		close(file->fd);
 #ifndef USE_POLL
 		close(file->out_fd);
@@ -127,7 +167,7 @@ altos_open(struct altos_device *device)
 #endif
 	ret = tcsetattr(file->fd, TCSAFLUSH, &term);
 	if (ret < 0) {
-		perror("tcsetattr");
+		altos_set_last_posix_error();
 		close(file->fd);
 #ifndef USE_POLL
 		close(file->out_fd);
@@ -179,8 +219,10 @@ altos_flush(struct altos_file *file)
 #else
 		ret = write (file->out_fd, file->out_data, file->out_used);
 #endif
-		if (ret < 0)
-			return -errno;
+		if (ret < 0) {
+			altos_set_last_posix_error();
+			return -last_error.code;
+		}
 		if (ret) {
 			memmove(file->out_data, file->out_data + ret,
 				file->out_used - ret);
@@ -205,7 +247,7 @@ altos_putchar(struct altos_file *file, char c)
 	ret = 0;
 	if (file->out_used == USB_BUF_SIZE)
 		ret = altos_flush(file);
-	return 0;
+	return ret;
 }
 
 #ifdef USE_POLL
@@ -232,7 +274,7 @@ altos_fill(struct altos_file *file, int timeout)
 		fd[1].events = POLLIN;
 		ret = poll(fd, 2, timeout);
 		if (ret < 0) {
-			perror("altos_getchar");
+			altos_set_last_posix_error();
 			return LIBALTOS_ERROR;
 		}
 		if (ret == 0)
@@ -245,7 +287,7 @@ altos_fill(struct altos_file *file, int timeout)
 		{
 			ret = read(file->fd, file->in_data, USB_BUF_SIZE);
 			if (ret < 0) {
-				perror("altos_getchar");
+				altos_set_last_posix_error();
 				return LIBALTOS_ERROR;
 			}
 			file->in_read = 0;
@@ -543,7 +585,7 @@ altos_list_start(void)
 		if (USB_IS_ALTUSMETRUM(dev->idVendor, dev->idProduct)) {
 			if (devs->dev)
 				devs->dev = realloc(devs->dev,
-						    devs->ndev + 1 * sizeof (struct usbdev *));
+						    (devs->ndev + 1) * sizeof (struct usbdev *));
 			else
 				devs->dev = malloc (sizeof (struct usbdev *));
 			devs->dev[devs->ndev++] = dev;
@@ -684,8 +726,10 @@ altos_bt_open(struct altos_bt_device *device)
 	if (!file)
 		goto no_file;
 	file->fd = socket(AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
-	if (file->fd < 0)
+	if (file->fd < 0) {
+		altos_set_last_posix_error();
 		goto no_sock;
+	}
 
 	addr.rc_family = AF_BLUETOOTH;
 	addr.rc_channel = 1;
@@ -695,9 +739,10 @@ altos_bt_open(struct altos_bt_device *device)
 			 (struct sockaddr *)&addr,
 			 sizeof(addr));
 	if (status < 0) {
-		perror("connect");
+		altos_set_last_posix_error();
 		goto no_link;
 	}
+	sleep(1);
 
 #ifdef USE_POLL
 	pipe(file->pipe);
@@ -775,8 +820,8 @@ get_number(io_object_t object, CFStringRef entry, int *result)
 	return 0;
 }
 
-struct altos_list *
-altos_list_start(int time)
+PUBLIC struct altos_list *
+altos_list_start(void)
 {
 	struct altos_list *list = calloc (sizeof (struct altos_list), 1);
 	CFMutableDictionaryRef matching_dictionary = IOServiceMatching("IOUSBDevice");
@@ -791,7 +836,7 @@ altos_list_start(int time)
 	return list;
 }
 
-int
+PUBLIC int
 altos_list_next(struct altos_list *list, struct altos_device *device)
 {
 	io_object_t object;
@@ -818,13 +863,55 @@ altos_list_next(struct altos_list *list, struct altos_device *device)
 	}
 }
 
-void
+PUBLIC void
 altos_list_finish(struct altos_list *list)
 {
 	IOObjectRelease (list->iterator);
 	free(list);
 }
 
+struct altos_bt_list {
+	int		sock;
+	int		dev_id;
+	int		rsp;
+	int		num_rsp;
+};
+
+#define INQUIRY_MAX_RSP	255
+
+struct altos_bt_list *
+altos_bt_list_start(int inquiry_time)
+{
+	return NULL;
+}
+
+int
+altos_bt_list_next(struct altos_bt_list *bt_list,
+		   struct altos_bt_device *device)
+{
+	return 0;
+}
+
+void
+altos_bt_list_finish(struct altos_bt_list *bt_list)
+{
+}
+
+void
+altos_bt_fill_in(char *name, char *addr, struct altos_bt_device *device)
+{
+	strncpy(device->name, name, sizeof (device->name));
+	device->name[sizeof(device->name)-1] = '\0';
+	strncpy(device->addr, addr, sizeof (device->addr));
+	device->addr[sizeof(device->addr)-1] = '\0';
+}
+
+struct altos_file *
+altos_bt_open(struct altos_bt_device *device)
+{
+	return NULL;
+}
+
 #endif
 
 
@@ -853,6 +940,25 @@ struct altos_file {
 	OVERLAPPED			ov_write;
 };
 
+static void
+_altos_set_last_windows_error(char *file, int line)
+{
+	DWORD	error = GetLastError();
+	TCHAR	message[1024];
+	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
+		      0,
+		      error,
+		      0,
+		      message,
+		      sizeof (message) / sizeof (TCHAR),
+		      NULL);
+	if (error != ERROR_SUCCESS)
+		printf ("%s:%d %s\n", file, line, message);
+	altos_set_last_error(error, message);
+}
+
+#define altos_set_last_windows_error() _altos_set_last_windows_error(__FILE__, __LINE__)
+
 PUBLIC struct altos_list *
 altos_list_start(void)
 {
@@ -863,7 +969,7 @@ altos_list_start(void)
 	list->dev_info = SetupDiGetClassDevs(NULL, "USB", NULL,
 					     DIGCF_ALLCLASSES|DIGCF_PRESENT);
 	if (list->dev_info == INVALID_HANDLE_VALUE) {
-		printf("SetupDiGetClassDevs failed %d\n", GetLastError());
+		altos_set_last_windows_error();
 		free(list);
 		return NULL;
 	}
@@ -875,13 +981,13 @@ PUBLIC int
 altos_list_next(struct altos_list *list, struct altos_device *device)
 {
 	SP_DEVINFO_DATA dev_info_data;
-	char		port[128];
+	BYTE		port[128];
 	DWORD		port_len;
 	char		friendlyname[256];
-	char		symbolic[256];
+	BYTE		symbolic[256];
 	DWORD		symbolic_len;
 	HKEY		dev_key;
-	int		vid, pid;
+	unsigned int	vid, pid;
 	int		serial;
 	HRESULT 	result;
 	DWORD		friendlyname_type;
@@ -897,6 +1003,7 @@ altos_list_next(struct altos_list *list, struct altos_device *device)
 					       DICS_FLAG_GLOBAL, 0, DIREG_DEV,
 					       KEY_READ);
 		if (dev_key == INVALID_HANDLE_VALUE) {
+			altos_set_last_windows_error();
 			printf("cannot open device registry key\n");
 			continue;
 		}
@@ -907,16 +1014,17 @@ altos_list_next(struct altos_list *list, struct altos_device *device)
 		result = RegQueryValueEx(dev_key, "SymbolicName", NULL, NULL,
 					 symbolic, &symbolic_len);
 		if (result != 0) {
+			altos_set_last_windows_error();
 			printf("cannot find SymbolicName value\n");
 			RegCloseKey(dev_key);
 			continue;
 		}
 		vid = pid = serial = 0;
-		sscanf(symbolic + sizeof("\\??\\USB#VID_") - 1,
+		sscanf((char *) symbolic + sizeof("\\??\\USB#VID_") - 1,
 		       "%04X", &vid);
-		sscanf(symbolic + sizeof("\\??\\USB#VID_XXXX&PID_") - 1,
+		sscanf((char *) symbolic + sizeof("\\??\\USB#VID_XXXX&PID_") - 1,
 		       "%04X", &pid);
-		sscanf(symbolic + sizeof("\\??\\USB#VID_XXXX&PID_XXXX#") - 1,
+		sscanf((char *) symbolic + sizeof("\\??\\USB#VID_XXXX&PID_XXXX#") - 1,
 		       "%d", &serial);
 		if (!USB_IS_ALTUSMETRUM(vid, pid)) {
 			RegCloseKey(dev_key);
@@ -929,6 +1037,7 @@ altos_list_next(struct altos_list *list, struct altos_device *device)
 					 port, &port_len);
 		RegCloseKey(dev_key);
 		if (result != 0) {
+			altos_set_last_windows_error();
 			printf("failed to get PortName\n");
 			continue;
 		}
@@ -944,6 +1053,7 @@ altos_list_next(struct altos_list *list, struct altos_device *device)
 						     sizeof(friendlyname),
 						     &friendlyname_len))
 		{
+			altos_set_last_windows_error();
 			printf("Failed to get friendlyname\n");
 			continue;
 		}
@@ -952,12 +1062,14 @@ altos_list_next(struct altos_list *list, struct altos_device *device)
 		device->serial = serial;
 		strcpy(device->name, friendlyname);
 
-		strcpy(device->path, port);
+		strcpy(device->path, (char *) port);
 		return 1;
 	}
 	result = GetLastError();
-	if (result != ERROR_NO_MORE_ITEMS)
-		printf ("SetupDiEnumDeviceInfo failed error %d\n", result);
+	if (result != ERROR_NO_MORE_ITEMS) {
+		altos_set_last_windows_error();
+		printf ("SetupDiEnumDeviceInfo failed error %d\n", (int) result);
+	}
 	return 0;
 }
 
@@ -976,8 +1088,10 @@ altos_queue_read(struct altos_file *file)
 		return LIBALTOS_SUCCESS;
 
 	if (!ReadFile(file->handle, file->in_data, USB_BUF_SIZE, &got, &file->ov_read)) {
-		if (GetLastError() != ERROR_IO_PENDING)
+		if (GetLastError() != ERROR_IO_PENDING) {
+			altos_set_last_windows_error();
 			return LIBALTOS_ERROR;
+		}
 		file->pend_read = TRUE;
 	} else {
 		file->pend_read = FALSE;
@@ -1002,8 +1116,10 @@ altos_wait_read(struct altos_file *file, int timeout)
 	ret = WaitForSingleObject(file->ov_read.hEvent, timeout);
 	switch (ret) {
 	case WAIT_OBJECT_0:
-		if (!GetOverlappedResult(file->handle, &file->ov_read, &got, FALSE))
+		if (!GetOverlappedResult(file->handle, &file->ov_read, &got, FALSE)) {
+			altos_set_last_windows_error();
 			return LIBALTOS_ERROR;
+		}
 		file->pend_read = FALSE;
 		file->in_read = 0;
 		file->in_used = got;
@@ -1040,22 +1156,30 @@ altos_fill(struct altos_file *file, int timeout)
 PUBLIC int
 altos_flush(struct altos_file *file)
 {
-	DWORD	put;
-	char	*data = file->out_data;
-	char	used = file->out_used;
-	DWORD	ret;
+	DWORD		put;
+	unsigned char	*data = file->out_data;
+	int		used = file->out_used;
+	DWORD		ret;
 
 	while (used) {
 		if (!WriteFile(file->handle, data, used, &put, &file->ov_write)) {
-			if (GetLastError() != ERROR_IO_PENDING)
+			if (GetLastError() != ERROR_IO_PENDING) {
+				altos_set_last_windows_error();
+				printf ("\tflush write error\n");
 				return LIBALTOS_ERROR;
+			}
 			ret = WaitForSingleObject(file->ov_write.hEvent, INFINITE);
 			switch (ret) {
 			case WAIT_OBJECT_0:
-				if (!GetOverlappedResult(file->handle, &file->ov_write, &put, FALSE))
+				if (!GetOverlappedResult(file->handle, &file->ov_write, &put, FALSE)) {
+					altos_set_last_windows_error();
+					printf ("\tflush result error\n");
 					return LIBALTOS_ERROR;
+				}
 				break;
 			default:
+				altos_set_last_windows_error();
+				printf ("\tflush wait error\n");
 				return LIBALTOS_ERROR;
 			}
 		}
@@ -1071,7 +1195,6 @@ altos_open(struct altos_device *device)
 {
 	struct altos_file	*file = calloc (1, sizeof (struct altos_file));
 	char	full_name[64];
-	DCB dcbSerialParams = {0};
 	COMMTIMEOUTS timeouts;
 
 	if (!file)
@@ -1083,6 +1206,8 @@ altos_open(struct altos_device *device)
 				  0, NULL, OPEN_EXISTING,
 				  FILE_FLAG_OVERLAPPED, NULL);
 	if (file->handle == INVALID_HANDLE_VALUE) {
+		altos_set_last_windows_error();
+		printf ("cannot open %s\n", full_name);
 		free(file);
 		return NULL;
 	}
@@ -1096,22 +1221,6 @@ altos_open(struct altos_device *device)
 	timeouts.WriteTotalTimeoutConstant = 0;
 	SetCommTimeouts(file->handle, &timeouts);
 
-	dcbSerialParams.DCBlength = sizeof(dcbSerialParams);
-	if (!GetCommState(file->handle, &dcbSerialParams)) {
-		CloseHandle(file->handle);
-		free(file);
-		return NULL;
-	}
-	dcbSerialParams.BaudRate = CBR_9600;
-	dcbSerialParams.ByteSize = 8;
-	dcbSerialParams.StopBits = ONESTOPBIT;
-	dcbSerialParams.Parity = NOPARITY;
-	if (!SetCommState(file->handle, &dcbSerialParams)) {
-		CloseHandle(file->handle);
-		free(file);
-		return NULL;
-	}
-
 	return file;
 }
 
@@ -1121,6 +1230,10 @@ altos_close(struct altos_file *file)
 	if (file->handle != INVALID_HANDLE_VALUE) {
 		CloseHandle(file->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);
 	}
 }
 
@@ -1131,7 +1244,7 @@ altos_free(struct altos_file *file)
 	free(file);
 }
 
-int
+PUBLIC int
 altos_putchar(struct altos_file *file, char c)
 {
 	int	ret;
@@ -1147,7 +1260,7 @@ altos_putchar(struct altos_file *file, char c)
 	return LIBALTOS_SUCCESS;
 }
 
-int
+PUBLIC int
 altos_getchar(struct altos_file *file, int timeout)
 {
 	int	ret;
@@ -1161,4 +1274,38 @@ altos_getchar(struct altos_file *file, int timeout)
 	return file->in_data[file->in_read++];
 }
 
+struct altos_bt_list *
+altos_bt_list_start(int inquiry_time)
+{
+	return NULL;
+}
+
+int
+altos_bt_list_next(struct altos_bt_list *bt_list,
+		   struct altos_bt_device *device)
+{
+	return 0;
+}
+
+void
+altos_bt_list_finish(struct altos_bt_list *bt_list)
+{
+	free(bt_list);
+}
+
+void
+altos_bt_fill_in(char *name, char *addr, struct altos_bt_device *device)
+{
+	strncpy(device->name, name, sizeof (device->name));
+	device->name[sizeof(device->name)-1] = '\0';
+	strncpy(device->addr, addr, sizeof (device->addr));
+	device->addr[sizeof(device->addr)-1] = '\0';
+}
+
+struct altos_file *
+altos_bt_open(struct altos_bt_device *device)
+{
+	return NULL;
+}
+
 #endif