don't print crnl to console

[hmcfgusb] / hmland.c

diff --git a/hmland.c b/hmland.c
index f3353f6c1d943def551c27b731ef1e654ae26a1b..4efc8b5296321ebcd9bb61fb890918016c2c2449 100644 (file)
--- a/hmland.c
+++ b/hmland.c
@@ -239,8 +239,14 @@ 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);
+       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) {
@@ -270,9 +276,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;
 
@@ -295,10 +298,17 @@ 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++;
 
-                       switch(buf[0]) {
+                       switch(*instart) {
                                case 'S':
                                        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);
@@ -307,6 +317,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;
@@ -324,9 +339,10 @@ static int hmlan_parse_in(int fd, void *data)
        return 1;
 }
 
-static int comm(int fd_in, int fd_out, int master_socket)
+static int comm(int fd_in, int fd_out, int master_socket, int flags)
 {
        struct hmcfgusb_dev *dev;
+       uint8_t out[0x40]; //FIXME!!!
        int quit = 0;
 
        hmcfgusb_set_debug(debug);
@@ -351,12 +367,15 @@ static int comm(int fd_in, int fd_out, int master_socket)
                }
        }
 
-       hmcfgusb_send(dev, (unsigned char*)"K", 1, 1);
+       memset(out, 0, sizeof(out));
+       out[0] = 'K';
+       hmcfgusb_send_null_frame(dev);
+       hmcfgusb_send(dev, out, sizeof(out), 1);
 
        while(!quit) {
                int fd;
 
-               fd = hmcfgusb_poll(dev, 3600);
+               fd = hmcfgusb_poll(dev, 1);     /* Wakeup device/bus at least once a second */
                if (fd >= 0) {
                        if (fd == master_socket) {
                                int client;
@@ -375,6 +394,9 @@ static int comm(int fd_in, int fd_out, int master_socket)
                        if (errno) {
                                perror("hmcfgusb_poll");
                                quit = 1;
+                       } else {
+                               /* periodically wakeup the device */
+                               hmcfgusb_send_null_frame(dev);
                        }
                }
        }
@@ -535,7 +557,7 @@ static int socket_server(char *iface, int port, int flags)
                                        (client_addr & 0x000000ff));
                }
 
-               comm(client, client, sock);
+               comm(client, client, sock, flags);
 
                shutdown(client, SHUT_RDWR);
                close(client);
@@ -547,15 +569,15 @@ static int socket_server(char *iface, int port, int flags)
                                        (client_addr & 0x0000ff00) >> 8,
                                        (client_addr & 0x000000ff));
                }
-
+               sleep(1);
        }
 
        return EXIT_SUCCESS;
 }
 
-static int interactive_server(void)
+static int interactive_server(int flags)
 {
-       if (!comm(STDIN_FILENO, STDOUT_FILENO, -1))
+       if (!comm(STDIN_FILENO, STDOUT_FILENO, -1, flags))
                return EXIT_FAILURE;
 
        return EXIT_SUCCESS;
@@ -585,7 +607,7 @@ int main(int argc, char **argv)
        char *ep;
        int opt;
 
-       while((opt = getopt(argc, argv, "DdhiPp:l:v")) != -1) {
+       while((opt = getopt(argc, argv, "DdhiPp:Rl:v")) != -1) {
                switch (opt) {
                        case 'D':
                                debug = 1;
@@ -607,6 +629,9 @@ int main(int argc, char **argv)
                                        exit(EXIT_FAILURE);
                                }
                                break;
+                       case 'R':
+                               fprintf(stderr, "-R is no longer needed (1s wakeup is default)\n");
+                               break;
                        case 'l':
                                iface = optarg;
                                break;
@@ -624,7 +649,7 @@ int main(int argc, char **argv)
        }
        
        if (interactive) {
-               return interactive_server();
+               return interactive_server(flags);
        } else {
                return socket_server(iface, port, flags);
        }