X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/885a84e3a91964fb6dada1120be301102268e6ab..018f85faaef11f00f1f7736ccfe4d8f2fc9671ab:/hmsniff.c

diff --git a/hmsniff.c b/hmsniff.c
index 67a2df6..79fc2c9 100644
--- a/hmsniff.c
+++ b/hmsniff.c
@@ -32,6 +32,7 @@
 #include <sys/time.h>
 #include <libusb-1.0/libusb.h>
 
+#include "version.h"
 #include "hexdump.h"
 #include "hmcfgusb.h"
 
@@ -138,12 +139,12 @@ struct recv_data {
 	int wrong_hmid;
 };
 
-static void parse_hmcfgusb(uint8_t *buf, int buf_len, void *data)
+static int parse_hmcfgusb(uint8_t *buf, int buf_len, void *data)
 {
 	struct recv_data *rdata = data;
 
 	if (buf_len < 1)
-		return;
+		return 1;
 
 	switch(buf[0]) {
 		case 'E':
@@ -164,6 +165,8 @@ static void parse_hmcfgusb(uint8_t *buf, int buf_len, void *data)
 			hexdump(buf, buf_len, "Unknown> ");
 			break;
 	}
+
+	return 1;
 }
 
 int main(int argc, char **argv)
@@ -186,6 +189,7 @@ int main(int argc, char **argv)
 		}
 		printf("HM-CFG-USB opened!\n");
 
+		hmcfgusb_send_null_frame(dev, 1);
 		hmcfgusb_send(dev, (unsigned char*)"K", 1, 1);
 
 		while(!quit) {
@@ -197,14 +201,19 @@ int main(int argc, char **argv)
 				rdata.wrong_hmid = 0;
 				hmcfgusb_send(dev, (unsigned char*)"K", 1, 1);
 			}
-			fd = hmcfgusb_poll(dev, 10);
+			fd = hmcfgusb_poll(dev, 1000);
 			if (fd >= 0) {
 				fprintf(stderr, "activity on unknown fd %d!\n", fd);
 				continue;
 			} else if (fd == -1) {
 				if (errno) {
-					perror("hmcfgusb_poll");
-					break;
+					if (errno != ETIMEDOUT) {
+						perror("hmcfgusb_poll");
+						break;
+					} else {
+						/* periodically wakeup the device */
+						hmcfgusb_send_null_frame(dev, 1);
+					}
 				}
 			}
 		}
@@ -212,5 +221,7 @@ int main(int argc, char **argv)
 		hmcfgusb_close(dev);
 	} while (!quit);
 
+	hmcfgusb_exit();
+
 	return EXIT_SUCCESS;
 }