brcm63xx: add support for Huawei HG622

[librecmc/librecmc.git] / tools / firmware-utils / src / addpattern.c

diff --git a/tools/firmware-utils/src/addpattern.c b/tools/firmware-utils/src/addpattern.c
index 6eccb1bd9922402c55fef98175cbb1339aa0fc0a..1d72285610e4264786e6b8422b6bc5cdebc16187 100644 (file)
--- a/tools/firmware-utils/src/addpattern.c
+++ b/tools/firmware-utils/src/addpattern.c
@@ -77,10 +77,11 @@
 /* (from 3.00.24 firmware cyutils.h) */
 #define SUPPORT_4704_CHIP      0x0008
 #define SUPPORT_5352E_CHIP     0x0010
+/* (from WD My Net Wi-Fi Range Extender's cyutils.s) */
+#define SUPPORT_4703_CHIP      0x0020
 
 struct code_header {                   /* from cyutils.h */
-       char magic[4];
-       char res1[4];                           /* for extra magic */
+       char magic[8];
        char fwdate[3];
        char fwvern[3];
        char id[4];                                     /* U2ND */
@@ -110,6 +111,13 @@ struct board_info boards[] = {
                .hw_ver         = 0x00,
                .sn             = 0x0f,
                .flags          = {0x3f, 0x00},
+       },
+       {
+               .id             = "mynet-rext",
+               .pattern        = "WDHNSTFH",
+               .hw_ver         = 0x00,
+               .sn             = 0x00,
+               .flags          = {0x3f, 0x00},
        }, {
                /* Terminating entry */
                .id     = NULL,
@@ -205,8 +213,10 @@ int main(int argc, char **argv)
                                break;
                        case '5':
                                /* V5 is appended to trxV2 image */
-                               hdr->stable[0] = hdr->stable[1] = 0xFF;
-                               hdr->try1[0]   = hdr->try1[1]   = 0xFF;
+                               hdr->stable[0] = 0x73; // force image to be stable
+                               hdr->stable[1] = 0x00;
+                               hdr->try1[0]   = 0x74; // force try1 to be set
+                               hdr->try1[1]   = 0x00;
                                hdr->try2[0]   = hdr->try2[1]   = 0xFF;
                                hdr->try3[0]   = hdr->try3[1]   = 0xFF;
                                break;
@@ -241,8 +251,8 @@ int main(int argc, char **argv)
                hdr->flags[1] = board->flags[1];
        }
 
-       if (strlen(pattern) != 4) {
-               fprintf(stderr, "illegal pattern \"%s\": length != 4\n", pattern);
+       if (strlen(pattern) > 8) {
+               fprintf(stderr, "illegal pattern \"%s\"\n", pattern);
                usage();
        }
 
@@ -268,16 +278,16 @@ int main(int argc, char **argv)
                return EXIT_FAILURE;
        }
 
-       memcpy(&hdr->magic, pattern, 4);
+       memcpy(hdr->magic, pattern, strlen(pattern));
        if (pbotflag)
-               memcpy(&hdr->res1, pbotpat, 4);
+               memcpy(&hdr->magic[4], pbotpat, 4);
        hdr->fwdate[0] = ptm->tm_year % 100;
        hdr->fwdate[1] = ptm->tm_mon + 1;
        hdr->fwdate[2] = ptm->tm_mday;
        hdr->fwvern[0] = v0;
        hdr->fwvern[1] = v1;
        hdr->fwvern[2] = v2;
-       memcpy(&hdr->id, CODE_ID, strlen(CODE_ID));
+       memcpy(hdr->id, CODE_ID, strlen(CODE_ID));
 
        off = sizeof(struct code_header);