X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4c1e0fff7d23d61530c22ce4feabeafd8204ff67..262e7ef48dc0b08c88cf37b19b618e6507830c0b:/package/broadcom-diag/src/diag.c

diff --git a/package/broadcom-diag/src/diag.c b/package/broadcom-diag/src/diag.c
index c85401f7f..92d660ed3 100644
--- a/package/broadcom-diag/src/diag.c
+++ b/package/broadcom-diag/src/diag.c
@@ -54,6 +54,7 @@ enum {
 	WRT54G,
 	WRTSL54GS,
 	WRT54G3G,
+	WRT350N,
 	
 	/* ASUS */
 	WLHDD,
@@ -70,6 +71,7 @@ enum {
 	WHR2_A54G54,
 	WLA2_G54L,
 	WZR_RS_G54,
+	WZR_RS_G54HP,
 	BUFFALO_UNKNOWN,
 	BUFFALO_UNKNOWN_4710,
 
@@ -90,6 +92,12 @@ enum {
 
 	/* Belkin */
 	BELKIN_UNKNOWN,
+
+	/* Netgear */
+	WGT634U,
+
+	/* Trendware */
+	TEW411BRPP,
 };
 
 static struct platform_t __initdata platforms[] = {
@@ -167,6 +175,17 @@ static struct platform_t __initdata platforms[] = {
 			{ .name = "3g_blink",	.gpio = 1 << 5, .polarity = NORMAL },
 		},
 	},
+	[WRT350N] = {
+		.name		= "Linksys WRT350N",
+		.buttons	= {
+			{ .name = "reset",	.gpio = 1 << 6 },
+			{ .name = "ses",	.gpio = 1 << 8 },
+		},
+		.leds		= {
+			{ .name = "power",	.gpio = 1 << 1, .polarity = NORMAL },
+			{ .name = "ses",	.gpio = 1 << 3, .polarity = REVERSE },
+		},
+	},
 	/* Asus */
 	[WLHDD] = {
 		.name		= "ASUS WL-HDD",
@@ -284,10 +303,24 @@ static struct platform_t __initdata platforms[] = {
 		.name		= "Buffalo WZR-RS-G54",
 		.buttons	= {
 			{ .name = "ses",	.gpio = 1 << 0 },
-			{ .name = "reset",	.gpio = 1 << 7 },
+			{ .name = "reset",	.gpio = 1 << 4 },
 		},
 		.leds		= {
-			{ .name = "diag",	.gpio = 1 << 1, .polarity = REVERSE },
+			{ .name = "diag",	.gpio = 1 << 7, .polarity = REVERSE },
+			{ .name = "ses",	.gpio = 1 << 6, .polarity = REVERSE },
+			{ .name = "vpn",	.gpio = 1 << 1, .polarity = REVERSE },
+		},
+	},
+	[WZR_RS_G54HP] = {
+		.name		= "Buffalo WZR-RS-G54HP",
+		.buttons	= {
+			{ .name = "ses",	.gpio = 1 << 0 },
+			{ .name = "reset",	.gpio = 1 << 4 },
+		},
+		.leds		= {
+			{ .name = "diag",	.gpio = 1 << 7, .polarity = REVERSE },
+			{ .name = "ses",	.gpio = 1 << 6, .polarity = REVERSE },
+			{ .name = "vpn",	.gpio = 1 << 1, .polarity = REVERSE },
 		},
 	},
 	[BUFFALO_UNKNOWN] = {
@@ -401,6 +434,28 @@ static struct platform_t __initdata platforms[] = {
 			{ .name = "connected",	.gpio = 1 << 0, .polarity = NORMAL },
 		},
 	},
+	/* Netgear */
+	[WGT634U] = {
+		.name		= "Netgear WGT634U",
+		.buttons	= {
+			{ .name = "reset",	.gpio = 1 << 2 },
+		},
+		.leds		= {
+			{ .name = "power",	.gpio = 1 << 3, .polarity = REVERSE },
+		},
+	},
+	/* Trendware */
+	[TEW411BRPP] = {
+		.name           = "Trendware TEW411BRP+",
+		.buttons        = {
+			{ /* No usable buttons */ },
+		},
+		.leds           = {
+			{ .name = "power",      .gpio = 1 << 7, .polarity = NORMAL },
+			{ .name = "wlan",       .gpio = 1 << 1, .polarity = NORMAL },
+			{ .name = "bridge",     .gpio = 1 << 6, .polarity = NORMAL },
+		},
+	},
 };
 
 static struct platform_t __init *platform_detect(void)
@@ -412,6 +467,9 @@ static struct platform_t __init *platform_detect(void)
 	if (strncmp(getvar("pmon_ver"), "CFE", 3) == 0) {
 		/* CFE based - newer hardware */
 		if (!strcmp(boardnum, "42")) { /* Linksys */
+			if (!strcmp(boardtype, "0x478") && !strcmp(getvar("cardbus"), 1))
+				return &platforms[WRT350N];
+
 			if (!strcmp(boardtype, "0x0101") && !strcmp(getvar("boot_ver"), "v3.6"))
 				return &platforms[WRT54G3G];
 
@@ -476,6 +534,8 @@ static struct platform_t __init *platform_detect(void)
 			return &platforms[WHR2_A54G54];
 		if (!strcmp(buf, "30083"))
 			return &platforms[WZR_RS_G54];
+		if (!strcmp(buf, "30103"))
+			return &platforms[WZR_RS_G54HP];
 	}
 
 	if (buf || !strcmp(boardnum, "00")) {/* probably buffalo */
@@ -485,13 +545,16 @@ static struct platform_t __init *platform_detect(void)
 			return &platforms[BUFFALO_UNKNOWN];
 	}
 
-
 	if (!strcmp(getvar("CFEver"), "MotoWRv203") ||
 		!strcmp(getvar("MOTO_BOARD_TYPE"), "WR_FEM1")) {
 
 		return &platforms[WR850GV2V3];
 	}
 
+	if (!strcmp(boardnum, "44")) {  /* Trendware TEW-411BRP+ */
+		return &platforms[TEW411BRPP];
+	}
+
 	/* not found */
 	return NULL;
 }
@@ -539,6 +602,8 @@ static irqreturn_t button_handler(int irq, void *dev_id, struct pt_regs *regs)
 	changed = platform.button_polarity ^ in;
 	platform.button_polarity = in;
 
+	changed &= ~gpio_outen(0, 0);
+
 	for (b = platform.buttons; b->name; b++) { 
 		struct event_t *event;