X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/23d96b595c0767c55240095f213704f6eeb6b35f..593603941876abd69288ff6bc92359634a565be4:/hmland.c

diff --git a/hmland.c b/hmland.c
index 15b46ab..d91026a 100644
--- a/hmland.c
+++ b/hmland.c
@@ -49,13 +49,21 @@ static int impersonate_hmlanif = 0;
 static int debug = 0;
 static int verbose = 0;
 
+struct queued_rx {
+	char *rx;
+	int len;
+	struct queued_rx *next;
+};
+
+static struct queued_rx *qrx = NULL;
+static int wait_for_h = 0;
+
 #define	FLAG_LENGTH_BYTE	(1<<0)
 #define	FLAG_FORMAT_HEX		(1<<1)
 #define	FLAG_COMMA_BEFORE	(1<<2)
 #define	FLAG_COMMA_AFTER	(1<<3)
 #define	FLAG_NL			(1<<4)
 #define	FLAG_IGNORE_COMMAS	(1<<5)
-#define	FLAG_PERIODIC_WAKEUP	(1<<6)
 
 #define CHECK_SPACE(x)		if ((*outpos + x) > outend) { fprintf(stderr, "Not enough space!\n"); return 0; }
 #define CHECK_AVAIL(x)		if ((*inpos + x) > inend) { fprintf(stderr, "Not enough input available!\n"); return 0; }
@@ -240,8 +248,41 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data)
 			hexdump(buf, buf_len, "Unknown> ");
 			break;
 	}
-	if (debug)
-		fprintf(stderr, "LAN < %s\n", out);
+
+	/* Queue packet until first respone to 'K' is received */
+	if (wait_for_h && buf[0] != 'H') {
+		struct queued_rx **rxp = &qrx;
+
+		while (*rxp)
+			rxp = &((*rxp)->next);
+
+		*rxp = malloc(sizeof(struct queued_rx));
+		if (!*rxp) {
+			perror("malloc");
+			return 0;
+		}
+
+		memset(*rxp, 0, sizeof(struct queued_rx));
+		(*rxp)->len = outpos-out;
+		(*rxp)->rx = malloc((*rxp)->len);
+		if (!(*rxp)->rx) {
+			perror("malloc");
+			return 0;
+		}
+		memset((*rxp)->rx, 0, (*rxp)->len);
+		memcpy((*rxp)->rx, out, (*rxp)->len);
+
+		return 1;
+	}
+
+	if (verbose) {
+		int i;
+
+		printf("LAN < ");
+		for (i = 0; i < outpos-out-2; i++)
+			printf("%c", out[i]);
+		printf("\n");
+	}
 
 	w = write(fd, out, outpos-out);
 	if (w <= 0) {
@@ -249,6 +290,37 @@ static int hmlan_format_out(uint8_t *buf, int buf_len, void *data)
 		return 0;
 	}
 
+	/* Send all queued packets */
+	if (wait_for_h) {
+		struct queued_rx *curr_rx = qrx;
+		struct queued_rx *last_rx;
+
+		while (curr_rx) {
+			if (verbose) {
+				int i;
+
+				printf("LAN < ");
+				for (i = 0; i < curr_rx->len-2; i++)
+					printf("%c", curr_rx->rx[i]);
+				printf("\n");
+			}
+
+			w = write(fd, curr_rx->rx, curr_rx->len);
+			if (w <= 0) {
+				perror("write");
+			}
+			last_rx = curr_rx;
+			curr_rx = curr_rx->next;
+
+			free(last_rx->rx);
+			free(last_rx);
+		}
+
+		qrx = NULL;
+
+		wait_for_h = 0;
+	}
+
 	return 1;
 }
 
@@ -271,9 +343,6 @@ static int hmlan_parse_in(int fd, void *data)
 
 		inpos = buf;
 
-		if (debug)
-			fprintf(stderr, "\nLAN > %s", buf);
-
 		while (inpos < inend) {
 			uint8_t *instart = inpos;
 
@@ -296,6 +365,13 @@ static int hmlan_parse_in(int fd, void *data)
 			if (last == 0)
 				continue;
 
+			if (verbose) {
+				printf("LAN > ");
+				for (i = 0; i < last; i++)
+					printf("%c", instart[i]);
+				printf("\n");
+			}
+
 			memset(out, 0, sizeof(out));
 			*outpos++ = *inpos++;
 
@@ -308,6 +384,11 @@ static int hmlan_parse_in(int fd, void *data)
 					parse_part_in(&inpos, (last-(inpos-instart)), &outpos, (sizeof(out)-(outpos-out)), 0);
 					parse_part_in(&inpos, (last-(inpos-instart)), &outpos, (sizeof(out)-(outpos-out)), FLAG_LENGTH_BYTE);
 					break;
+				case 'Y':
+					parse_part_in(&inpos, (last-(inpos-instart)), &outpos, (sizeof(out)-(outpos-out)), 0);
+					parse_part_in(&inpos, (last-(inpos-instart)), &outpos, (sizeof(out)-(outpos-out)), 0);
+					parse_part_in(&inpos, (last-(inpos-instart)), &outpos, (sizeof(out)-(outpos-out)), FLAG_LENGTH_BYTE);
+					break;
 				default:
 					parse_part_in(&inpos, (last-(inpos-instart)), &outpos, (sizeof(out)-(outpos-out)), FLAG_IGNORE_COMMAS);
 					break;
@@ -329,7 +410,6 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags)
 {
 	struct hmcfgusb_dev *dev;
 	uint8_t out[0x40]; //FIXME!!!
-	int poll_timeout = 3600;
 	int quit = 0;
 
 	hmcfgusb_set_debug(debug);
@@ -354,17 +434,16 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags)
 		}
 	}
 
-	if (flags & FLAG_PERIODIC_WAKEUP)
-		poll_timeout = 1;
-
 	memset(out, 0, sizeof(out));
 	out[0] = 'K';
+	wait_for_h = 1;
+	hmcfgusb_send_null_frame(dev);
 	hmcfgusb_send(dev, out, sizeof(out), 1);
 
 	while(!quit) {
 		int fd;
 
-		fd = hmcfgusb_poll(dev, poll_timeout);
+		fd = hmcfgusb_poll(dev, 1);	/* Wakeup device/bus at least once a second */
 		if (fd >= 0) {
 			if (fd == master_socket) {
 				int client;
@@ -558,7 +637,7 @@ static int socket_server(char *iface, int port, int flags)
 					(client_addr & 0x0000ff00) >> 8,
 					(client_addr & 0x000000ff));
 		}
-
+		sleep(1);
 	}
 
 	return EXIT_SUCCESS;
@@ -583,7 +662,6 @@ void hmlan_syntax(char *prog)
 	fprintf(stderr, "\t-l ip\tlisten on given IP address only (for example 127.0.0.1)\n");
 	fprintf(stderr, "\t-P\tcreate PID file " PID_FILE " in daemon mode\n");
 	fprintf(stderr, "\t-p n\tlisten on port n (default 1000)\n");
-	fprintf(stderr, "\t-R\twakeup the device (and USB-bus) every second (fix for e.g. Raspberry Pi)\n");
 	fprintf(stderr, "\t-v\tverbose mode\n");
 
 }
@@ -620,7 +698,7 @@ int main(int argc, char **argv)
 				}
 				break;
 			case 'R':
-				flags |= FLAG_PERIODIC_WAKEUP;
+				fprintf(stderr, "-R is no longer needed (1s wakeup is default)\n");
 				break;
 			case 'l':
 				iface = optarg;