flash-hmcfgusb: remove dummy serial

[hmcfgusb] / hmland.c

diff --git a/hmland.c b/hmland.c
index f1f0e3dcf88595ca9b310057539e1eb5638f2d38..8e5d6daf642c797a6f0cebdf2a2cddeab8ea6b6d 100644 (file)
--- a/hmland.c
+++ b/hmland.c
@@ -43,6 +43,7 @@
 #include "version.h"
 #include "hexdump.h"
 #include "hmcfgusb.h"
+#include "util.h"
 
 #define PID_FILE "/var/run/hmland.pid"
 
@@ -64,6 +65,7 @@ static int reboot_at_minute = -1;
 static int reboot_set = 0;
 static uint8_t *lan_read_buf = NULL;
 static int lan_read_buflen = 0;
+static char *serial = NULL;
 
 struct queued_rx {
        char *rx;
@@ -141,8 +143,6 @@ static void write_log(char *buf, int len, char *fmt, ...)
 
 static int format_part_out(uint8_t **inpos, int inlen, uint8_t **outpos, int outlen, int len, int flags)
 {
-       const uint8_t nibble[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-               'A', 'B', 'C', 'D', 'E', 'F'};
        uint8_t *buf_out = *outpos;
        uint8_t *outend = *outpos + outlen;
        uint8_t *inend = *inpos + inlen;
@@ -164,9 +164,9 @@ static int format_part_out(uint8_t **inpos, int inlen, uint8_t **outpos, int out
                CHECK_AVAIL(len);
                CHECK_SPACE(len*2);
                for (i = 0; i < len; i++) {
-                       **outpos = nibble[((**inpos) & 0xf0) >> 4];
+                       **outpos = nibble_to_ascii(((**inpos) & 0xf0) >> 4);
                        *outpos += 1;
-                       **outpos = nibble[((**inpos) & 0xf)];
+                       **outpos = nibble_to_ascii(((**inpos) & 0xf));
                        *inpos += 1; *outpos += 1;
                }
        } else {
@@ -194,21 +194,6 @@ static int format_part_out(uint8_t **inpos, int inlen, uint8_t **outpos, int out
        return *outpos - buf_out;
 }
 
-static uint8_t ascii_to_nibble(uint8_t a)
-{
-       uint8_t c = 0x00;
-
-       if ((a >= '0') && (a <= '9')) {
-               c = a - '0';
-       } else if ((a >= 'A') && (a <= 'F')) {
-               c = (a - 'A') + 10;
-       } else if ((a >= 'a') && (a <= 'f')) {
-               c = (a - 'a') + 10;
-       }
-
-       return c;
-}
-
 static int parse_part_in(uint8_t **inpos, int inlen, uint8_t **outpos, int outlen, int flags)
 {
        uint8_t *buf_out = *outpos;
@@ -521,7 +506,7 @@ static int comm(int fd_in, int fd_out, int master_socket, int flags)
 
        hmcfgusb_set_debug(debug);
 
-       dev = hmcfgusb_init(hmlan_format_out, &fd_out);
+       dev = hmcfgusb_init(hmlan_format_out, &fd_out, serial);
        if (!dev) {
                fprintf(stderr, "Can't initialize HM-CFG-USB!\n");
                return 0;
@@ -824,6 +809,7 @@ void hmlan_syntax(char *prog)
        fprintf(stderr, "\t-p n\t\tlisten on port n (default: 1000)\n");
        fprintf(stderr, "\t-r n\t\treboot HM-CFG-USB after n seconds (0: no reboot, default: %u if FW < 0.967, 0 otherwise)\n", DEFAULT_REBOOT_SECONDS);
        fprintf(stderr, "\t   hh:mm\treboot HM-CFG-USB daily at hh:mm\n");
+       fprintf(stderr, "\t-S serial\tuse HM-CFG-USB with given serial (for multiple hmland instances)\n");
        fprintf(stderr, "\t-v\t\tverbose mode\n");
        fprintf(stderr, "\t-V\t\tshow version (" VERSION ")\n");
 
@@ -838,7 +824,7 @@ int main(int argc, char **argv)
        char *ep;
        int opt;
        
-       while((opt = getopt(argc, argv, "DdhIiPp:Rr:l:L:vV")) != -1) {
+       while((opt = getopt(argc, argv, "DdhIiPp:Rr:l:L:S:vV")) != -1) {
                switch (opt) {
                        case 'D':
                                debug = 1;
@@ -896,6 +882,9 @@ int main(int argc, char **argv)
                                        exit(EXIT_FAILURE);
                                }
                                break;
+                       case 'S':
+                               serial = optarg;
+                               break;
                        case 'v':
                                verbose = 1;
                                break;