broadcom-diag cleanup

SVN-Revision: 10691
owl
Andy Boyett 2008-03-31 08:04:06 +00:00
parent f97e92cee0
commit a6a59ce520
1 changed files with 32 additions and 30 deletions

View File

@ -3,6 +3,7 @@
*
* Copyright (C) 2006 Mike Baker <mbm@openwrt.org>,
* Copyright (C) 2006-2007 Felix Fietkau <nbd@openwrt.org>
* Copyright (C) 2008 Andy Boyett <agb@openwrt.org>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -46,6 +47,7 @@ extern u64 uevent_next_seqnum(void);
#include "diag.h"
#define getvar(str) (nvram_get(str)?:"")
static inline int startswith (char *source, char *cmp) { return !strncmp(source,cmp,strlen(cmp)); }
static int fill_event(struct event_t *);
static unsigned int gpiomask = 0;
module_param(gpiomask, int, 0644);
@ -653,7 +655,7 @@ static struct platform_t __init *platform_detect(void)
/* Based on "model_no" */
if (buf = nvram_get("model_no")) {
if (!strncmp(buf,"WL700", 5)) /* WL700* */
if (startswith(buf,"WL700")) /* WL700* */
return &platforms[WL700GE];
}
@ -663,7 +665,7 @@ static struct platform_t __init *platform_detect(void)
return &platforms[WR850GP];
if (!strcmp(buf,"WX-5565"))
return &platforms[TM2300];
if (!strncmp(buf,"WE800G", 6)) /* WE800G* */
if (startswith(buf,"WE800G")) /* WE800G* */
return &platforms[WE800G];
}
@ -694,7 +696,7 @@ static struct platform_t __init *platform_detect(void)
boardnum = getvar("boardnum");
boardtype = getvar("boardtype");
if (strncmp(getvar("pmon_ver"), "CFE", 3) == 0) {
if (startswith(getvar("pmon_ver"), "CFE")) {
/* CFE based - newer hardware */
if (!strcmp(boardnum, "42")) { /* Linksys */
if (!strcmp(boardtype, "0x478") && !strcmp(getvar("cardbus"), "1"))
@ -727,15 +729,15 @@ static struct platform_t __init *platform_detect(void)
(simple_strtoul(getvar("et0phyaddr"), NULL, 0) == 30)) {
return &platforms[WR850GV1];
}
if (!strncmp(boardtype, "bcm94710dev", 11)) {
if (startswith(boardtype, "bcm94710dev")) {
if (!strcmp(boardnum, "42"))
return &platforms[WRT54GV1];
if (simple_strtoul(boardnum, NULL, 0) == 2)
return &platforms[WAP54GV1];
}
if (!strncmp(getvar("hardware_version"), "WL500-", 6))
if (startswith(getvar("hardware_version"), "WL500-"))
return &platforms[WL500G];
if (!strncmp(getvar("hardware_version"), "WL300-", 6)) {
if (startswith(getvar("hardware_version"), "WL300-")) {
/* Either WL-300g or WL-HDD, do more extensive checks */
if ((simple_strtoul(getvar("et0phyaddr"), NULL, 0) == 0) &&
(simple_strtoul(getvar("et1phyaddr"), NULL, 0) == 1))
@ -745,23 +747,23 @@ static struct platform_t __init *platform_detect(void)
return &platforms[WL300G];
}
/* Sitecom WL-105b */
if (!strncmp(boardnum, "2", 1) && simple_strtoul(getvar("GemtekPmonVer"), NULL, 0) == 1)
if (startswith(boardnum, "2") && simple_strtoul(getvar("GemtekPmonVer"), NULL, 0) == 1)
return &platforms[WL105B];
/* unknown asus stuff, probably bcm4702 */
if (!strncmp(boardnum, "asusX", 5))
if (startswith(boardnum, "asusX"))
return &platforms[ASUS_4702];
}
if (buf || !strcmp(boardnum, "00")) {/* probably buffalo */
if (!strncmp(boardtype, "bcm94710ap", 10))
if (startswith(boardtype, "bcm94710ap"))
return &platforms[BUFFALO_UNKNOWN_4710];
else
return &platforms[BUFFALO_UNKNOWN];
}
if (!strncmp(getvar("CFEver"), "MotoWRv2", 8) ||
!strncmp(getvar("CFEver"), "MotoWRv3", 8) ||
if (startswith(getvar("CFEver"), "MotoWRv2") ||
startswith(getvar("CFEver"), "MotoWRv3") ||
!strcmp(getvar("MOTO_BOARD_TYPE"), "WR_FEM1")) {
return &platforms[WR850GV2V3];
@ -771,7 +773,7 @@ static struct platform_t __init *platform_detect(void)
return &platforms[TEW411BRPP];
}
if (!strncmp(boardnum, "04FN52", 6)) /* SimpleTech SimpleShare */
if (startswith(boardnum, "04FN52")) /* SimpleTech SimpleShare */
return &platforms[STI_NAS];
if (!strcmp(getvar("boardnum"), "10") && !strcmp(getvar("boardrev"), "0x13")) /* D-Link DWL-3150 */