tools: adapt addpattern for WD's Range Extender

A few things had to be changed to add support for these devices:
 - support code patterns with 8 characters
 - new board definition for the range extender device

Patchwork: http://patchwork.openwrt.org/patch/4280/
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38685
master
Gabor Juhos 11 years ago
parent 0615b9d83a
commit 5a85a21e06
  1. 22
      tools/firmware-utils/src/addpattern.c

@ -77,10 +77,11 @@
/* (from 3.00.24 firmware cyutils.h) */ /* (from 3.00.24 firmware cyutils.h) */
#define SUPPORT_4704_CHIP 0x0008 #define SUPPORT_4704_CHIP 0x0008
#define SUPPORT_5352E_CHIP 0x0010 #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 */ struct code_header { /* from cyutils.h */
char magic[4]; char magic[8];
char res1[4]; /* for extra magic */
char fwdate[3]; char fwdate[3];
char fwvern[3]; char fwvern[3];
char id[4]; /* U2ND */ char id[4]; /* U2ND */
@ -110,6 +111,13 @@ struct board_info boards[] = {
.hw_ver = 0x00, .hw_ver = 0x00,
.sn = 0x0f, .sn = 0x0f,
.flags = {0x3f, 0x00}, .flags = {0x3f, 0x00},
},
{
.id = "mynet-rext",
.pattern = "WDHNSTFH",
.hw_ver = 0x00,
.sn = 0x00,
.flags = {0x3f, 0x00},
}, { }, {
/* Terminating entry */ /* Terminating entry */
.id = NULL, .id = NULL,
@ -243,8 +251,8 @@ int main(int argc, char **argv)
hdr->flags[1] = board->flags[1]; hdr->flags[1] = board->flags[1];
} }
if (strlen(pattern) != 4) { if (strlen(pattern) > 8) {
fprintf(stderr, "illegal pattern \"%s\": length != 4\n", pattern); fprintf(stderr, "illegal pattern \"%s\"\n", pattern);
usage(); usage();
} }
@ -270,16 +278,16 @@ int main(int argc, char **argv)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
memcpy(&hdr->magic, pattern, 4); memcpy(hdr->magic, pattern, strlen(pattern));
if (pbotflag) if (pbotflag)
memcpy(&hdr->res1, pbotpat, 4); memcpy(&hdr->magic[4], pbotpat, 4);
hdr->fwdate[0] = ptm->tm_year % 100; hdr->fwdate[0] = ptm->tm_year % 100;
hdr->fwdate[1] = ptm->tm_mon + 1; hdr->fwdate[1] = ptm->tm_mon + 1;
hdr->fwdate[2] = ptm->tm_mday; hdr->fwdate[2] = ptm->tm_mday;
hdr->fwvern[0] = v0; hdr->fwvern[0] = v0;
hdr->fwvern[1] = v1; hdr->fwvern[1] = v1;
hdr->fwvern[2] = v2; 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); off = sizeof(struct code_header);

Loading…
Cancel
Save