add culfw firmware version-check

diff --git a/culfw.c b/culfw.c
index 0dfb807e290ce968a79c8be60a52aa71319526e0..a4c949baff77fdc6e1325c9a236bec427836f7c8 100644 (file)
--- a/culfw.c
+++ b/culfw.c
@@ -175,3 +175,34 @@ void culfw_close(struct culfw_dev *dev)
 {
        close(dev->fd);
 }
 {
        close(dev->fd);
 }

+
+void culfw_flush(struct culfw_dev *dev)
+{
+       struct pollfd pfds[1];
+       int ret;
+       int r = 0;
+       uint8_t buf[1024];
+
+       tcflush(dev->fd, TCIOFLUSH);
+
+       while(1) {
+               memset(pfds, 0, sizeof(struct pollfd) * 1);
+
+               pfds[0].fd = dev->fd;
+               pfds[0].events = POLLIN;
+
+               ret = poll(pfds, 1, 100);
+               if (ret <= 0)
+                       break;
+
+               if (!(pfds[0].revents & POLLIN))
+                       break;
+
+               memset(buf, 0, sizeof(buf));
+               r = read(dev->fd, buf, sizeof(buf));
+               if (r <= 0)
+                       break;
+       }
+
+       return;
+}

diff --git a/culfw.h b/culfw.h
index 29aacaf5d30fdb18624de1d7e1f53513cc9f386c..6f310fc5c90b29957e4d329cee1aa5740a320376 100644 (file)
--- a/culfw.h
+++ b/culfw.h
@@ -35,3 +35,4 @@ struct culfw_dev *culfw_init(char *device, uint32_t speed, culfw_cb_fn cb, void
 int culfw_send(struct culfw_dev *dev, char *cmd, int cmdlen);
 int culfw_poll(struct culfw_dev *dev, int timeout);
 void culfw_close(struct culfw_dev *dev);
 int culfw_send(struct culfw_dev *dev, char *cmd, int cmdlen);
 int culfw_poll(struct culfw_dev *dev, int timeout);
 void culfw_close(struct culfw_dev *dev);

+void culfw_flush(struct culfw_dev *dev);

diff --git a/flash-ota.c b/flash-ota.c
index fdd5936b250e283b08a809d9a90374e5ca73cb69..31e2ab5eced06184ef446b7b266679c3253525be 100644 (file)
--- a/flash-ota.c
+++ b/flash-ota.c
@@ -71,7 +71,7 @@ struct recv_data {
        enum message_type message_type;
        uint16_t status;
        int speed;
        enum message_type message_type;
        uint16_t status;
        int speed;

-       uint16_t hmcfgusb_version;
+       uint16_t version;

 };
 
 static int parse_hmcfgusb(uint8_t *buf, int buf_len, void *data)
 };
 
 static int parse_hmcfgusb(uint8_t *buf, int buf_len, void *data)


@@ -102,7 +102,7 @@ static int parse_hmcfgusb(uint8_t *buf, int buf_len, void *data)
                        rdata->speed = buf[1];
                        break;
                case 'H':
                        rdata->speed = buf[1];
                        break;
                case 'H':

-                       rdata->hmcfgusb_version = (buf[11] << 8) | buf[12];
+                       rdata->version = (buf[11] << 8) | buf[12];

                        my_hmid = (buf[0x1b] << 16) | (buf[0x1c] << 8) | buf[0x1d];
                        break;
                default:
                        my_hmid = (buf[0x1b] << 16) | (buf[0x1c] << 8) | buf[0x1d];
                        break;
                default:


@@ -125,25 +125,57 @@ static int parse_culfw(uint8_t *buf, int buf_len, void *data)
        if (buf_len <= 3)
                return 0;
 
        if (buf_len <= 3)
                return 0;
 

-       if (buf[0] != 'A')
-               return 0;
+       switch(buf[0]) {
+               case 'A':
+                       if (buf[1] == 's')
+                               return 0;
+
+                       while(validate_nibble(buf[(pos * 2) + 1]) &&
+                             validate_nibble(buf[(pos * 2) + 2]) &&
+                             (pos + 1 < buf_len)) {
+                               rdata->message[pos] = ascii_to_nibble(buf[(pos * 2) + 1]) << 4;
+                               rdata->message[pos] |= ascii_to_nibble(buf[(pos * 2) + 2]);
+                               pos++;
+                       }

 
 

-       if (buf[1] == 's')
-               return 0;
+                       if (hmid && (SRC(rdata->message) != hmid))
+                               return 0;

 
 

-       while(validate_nibble(buf[(pos * 2) + 1]) &&
-             validate_nibble(buf[(pos * 2) + 2]) &&
-             (pos + 1 < buf_len)) {
-               rdata->message[pos] = ascii_to_nibble(buf[(pos * 2) + 1]) << 4;
-               rdata->message[pos] |= ascii_to_nibble(buf[(pos * 2) + 2]);
-               pos++;
+                       rdata->message_type = MESSAGE_TYPE_E;
+                       break;
+               case 'V':
+                       {
+                               uint8_t v;
+                               char *s;
+                               char *e;
+
+                               s = ((char*)buf) + 2;
+                               e = strchr(s, '.');
+                               if (!e) {
+                                       fprintf(stderr, "Unknown response from CUL: %s", buf);
+                                       return 0;
+                               }
+                               *e = '\0';
+                               v = atoi(s);
+                               rdata->version = v << 8;
+
+                               s = e + 1;
+                               e = strchr(s, ' ');
+                               if (!e) {
+                                       fprintf(stderr, "Unknown response from CUL: %s", buf);
+                                       return 0;
+                               }
+                               *e = '\0';
+                               v = atoi(s);
+                               rdata->version |= v;
+                       }
+                       break;
+               default:
+                       fprintf(stderr, "Unknown response from CUL: %s", buf);
+                       return 0;
+                       break;

        }
 
        }
 

-       if (hmid && (SRC(rdata->message) != hmid))
-               return 0;
-
-       rdata->message_type = MESSAGE_TYPE_E;
-

        return 1;
 }
 
        return 1;
 }
 


@@ -372,12 +404,43 @@ int main(int argc, char **argv)
        memset(&dev, 0, sizeof(struct ota_dev));
 
        if (culfw_dev) {
        memset(&dev, 0, sizeof(struct ota_dev));
 
        if (culfw_dev) {

+               printf("Opening culfw-device at path %s with speed %u\n", culfw_dev, bps);

                dev.culfw = culfw_init(culfw_dev, bps, parse_culfw, &rdata);
                if (!dev.culfw) {
                        fprintf(stderr, "Can't initialize CUL at %s with rate %u\n", culfw_dev, bps);
                        exit(EXIT_FAILURE);
                }
                dev.type = DEVICE_TYPE_CULFW;
                dev.culfw = culfw_init(culfw_dev, bps, parse_culfw, &rdata);
                if (!dev.culfw) {
                        fprintf(stderr, "Can't initialize CUL at %s with rate %u\n", culfw_dev, bps);
                        exit(EXIT_FAILURE);
                }
                dev.type = DEVICE_TYPE_CULFW;

+
+               printf("Requesting firmware-version\n");
+               culfw_send(dev.culfw, "\r\n", 2);
+               culfw_flush(dev.culfw);
+
+               while (1) {
+                       culfw_send(dev.culfw, "V\r\n", 3);
+
+                       errno = 0;
+                       pfd = culfw_poll(dev.culfw, 1);
+                       if ((pfd < 0) && errno) {
+                               if (errno != ETIMEDOUT) {
+                                       perror("\n\nhmcfgusb_poll");
+                                       exit(EXIT_FAILURE);
+                               }
+                       }
+                       if (rdata.version)
+                               break;
+               }
+
+               printf("culfw-device firmware version: %u.%02u\n", 
+                       (rdata.version >> 8) & 0xff,
+                       rdata.version & 0xff);
+
+               if (rdata.version < 0x0139) {
+                       fprintf(stderr, "\nThis version does _not_ support firmware upgrade mode!\n");
+                       exit(EXIT_FAILURE);
+               } else if (rdata.version < 0x0140) {
+                       printf("\n*** This version probably not supports firmware upgrade mode! ***\n\n");
+               }

        } else {
                hmcfgusb_set_debug(debug);
 
        } else {
                hmcfgusb_set_debug(debug);
 


@@ -430,16 +493,16 @@ int main(int argc, char **argv)
                                        exit(EXIT_FAILURE);
                                }
                        }
                                        exit(EXIT_FAILURE);
                                }
                        }

-                       if (rdata.hmcfgusb_version)
+                       if (rdata.version)

                                break;
                }
 
                                break;
                }
 

-               if (rdata.hmcfgusb_version < 0x3c7) {
-                       fprintf(stderr, "HM-CFG-USB firmware too low: %u < 967\n", rdata.hmcfgusb_version);
+               if (rdata.version < 0x3c7) {
+                       fprintf(stderr, "HM-CFG-USB firmware too low: %u < 967\n", rdata.version);

                        exit(EXIT_FAILURE);
                }
 
                        exit(EXIT_FAILURE);
                }
 

-               printf("HM-CFG-USB firmware version: %u\n", rdata.hmcfgusb_version);
+               printf("HM-CFG-USB firmware version: %u\n", rdata.version);

        }
 
        if (!switch_speed(&dev, &rdata, 10)) {
        }
 
        if (!switch_speed(&dev, &rdata, 10)) {