reboot before flashing and retry a bit more often

[hmcfgusb] / flash-ota.c

diff --git a/flash-ota.c b/flash-ota.c
index fd6cd6e030ef8a3b17d8fe5d2262acf4e48f1f60..034ae785bcfcfc79e71c8455af1956f6dd1a0c6d 100644 (file)
--- a/flash-ota.c
+++ b/flash-ota.c
@@ -41,7 +41,10 @@
 #include "version.h"
 #include "hmcfgusb.h"
 
+#define MAX_RETRIES    5
+
 uint32_t hmid = 0;
+uint32_t my_hmid = 0;
 
 enum message_type {
        MESSAGE_TYPE_E,
@@ -85,6 +88,7 @@ static int parse_hmcfgusb(uint8_t *buf, int buf_len, void *data)
                        break;
                case 'H':
                        rdata->hmcfgusb_version = (buf[11] << 8) | buf[12];
+                       my_hmid = (buf[0x1b] << 16) | (buf[0x1c] << 8) | buf[0x1d];
                        break;
                default:
                        break;
@@ -133,7 +137,13 @@ int send_hm_message(struct hmcfgusb_dev *dev, struct recv_data *rdata, uint8_t *
                            ((rdata->status & 0xff) == 0x02)) {
                                break;
                        } else {
-                               fprintf(stderr, "\nInvalid status: %04x\n", rdata->status);
+                               if ((rdata->status & 0xff00) == 0x0400) {
+                                       fprintf(stderr, "\nOut of credits!\n");
+                               } else if ((rdata->status & 0xff) == 0x08) {
+                                       fprintf(stderr, "\nMissing ACK!\n");
+                               } else {
+                                       fprintf(stderr, "\nInvalid status: %04x\n", rdata->status);
+                               }
                                return 0;
                        }
                }
@@ -226,12 +236,34 @@ int main(int argc, char **argv)
                exit(EXIT_FAILURE);
        }
 
+       printf("\nRebooting HM-CFG-USB to avoid running out of credits\n\n");
+
+       if (!dev->bootloader) {
+               printf("HM-CFG-USB not in bootloader mode, entering bootloader.\n");
+               hmcfgusb_enter_bootloader(dev);
+               printf("Waiting for device to reappear...\n");
+
+               do {
+                       if (dev) {
+                               hmcfgusb_close(dev);
+                       }
+                       sleep(1);
+               } while (((dev = hmcfgusb_init(parse_hmcfgusb, &rdata)) == NULL) || (!dev->bootloader));
+       }
+
        if (dev->bootloader) {
-               fprintf(stderr, "\nHM-CFG-USB not in bootloader mode, aborting!\n");
-               exit(EXIT_FAILURE);
+               printf("HM-CFG-USB in bootloader mode, rebooting\n");
+               hmcfgusb_leave_bootloader(dev);
+
+               do {
+                       if (dev) {
+                               hmcfgusb_close(dev);
+                       }
+                       sleep(1);
+               } while (((dev = hmcfgusb_init(parse_hmcfgusb, &rdata)) == NULL) || (dev->bootloader));
        }
 
-       printf("\nHM-CFG-USB opened\n\n");
+       printf("\n\nHM-CFG-USB opened\n\n");
 
        memset(out, 0, sizeof(out));
        out[0] = 'K';
@@ -310,7 +342,7 @@ int main(int argc, char **argv)
                out[MSGID] = msgid++;
                out[CTL] = 0x00;
                out[TYPE] = 0xCB;
-               SET_SRC(out, 0x000000);
+               SET_SRC(out, my_hmid);
                SET_DST(out, hmid);
 
                memcpy(&out[PAYLOAD], switch_msg, sizeof(switch_msg));
@@ -332,7 +364,7 @@ int main(int argc, char **argv)
                out[MSGID] = msgid++;
                out[CTL] = 0x20;
                out[TYPE] = 0xCB;
-               SET_SRC(out, 0x000000);
+               SET_SRC(out, my_hmid);
                SET_DST(out, hmid);
 
                memcpy(&out[PAYLOAD], switch_msg, sizeof(switch_msg));
@@ -411,7 +443,7 @@ int main(int argc, char **argv)
                        if (ack)
                                out[CTL] = 0x20;
                        out[TYPE] = 0xCA;
-                       SET_SRC(out, 0x000000);
+                       SET_SRC(out, my_hmid);
                        SET_DST(out, hmid);
 
                        memcpy(&out[PAYLOAD], pos, payloadlen);
@@ -422,7 +454,7 @@ int main(int argc, char **argv)
                        } else {
                                pos = &(fw->fw[block][2]);
                                cnt++;
-                               if (cnt == 3) {
+                               if (cnt == MAX_RETRIES) {
                                        fprintf(stderr, "\nToo many errors, giving up!\n");
                                        exit(EXIT_FAILURE);
                                } else {