projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
broadcom-diag: fix WRT150N/WRT160N detection (patch from #10836)
[openwrt.git] / package / broadcom-diag / src / diag.c
diff --git a/package/broadcom-diag/src/diag.c b/package/broadcom-diag/src/diag.c
index c096dbd..4ac271e 100644 (file)
--- a/package/broadcom-diag/src/diag.c
+++ b/package/broadcom-diag/src/diag.c
@@ -2,7 +2,8 @@
  * diag.c - GPIO interface driver for Broadcom boards
  *
  * Copyright (C) 2006 Mike Baker <mbm@openwrt.org>,
  * diag.c - GPIO interface driver for Broadcom boards
  *
  * Copyright (C) 2006 Mike Baker <mbm@openwrt.org>,
- *                    Felix Fietkau <nbd@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
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,7 +19,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Id$
  */
 #include <linux/module.h>
 #include <linux/pci.h>
  */
 #include <linux/module.h>
 #include <linux/pci.h>
@@ -27,70 +27,168 @@
 #include <linux/timer.h>
 #include <linux/version.h>
 #include <asm/uaccess.h>
 #include <linux/timer.h>
 #include <linux/version.h>
 #include <asm/uaccess.h>
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#include <linux/kobject.h>
 #include <linux/workqueue.h>
 #include <linux/workqueue.h>
-#define hotplug_path uevent_helper
-#else
-#include <linux/tqueue.h>
-#define INIT_WORK INIT_TQUEUE
-#define schedule_work schedule_task
-#define work_struct tq_struct
-#endif
+#include <linux/skbuff.h>
+#include <linux/netlink.h>
+#include <linux/kobject.h>
+#include <net/sock.h>
+extern u64 uevent_next_seqnum(void);
 
 #include "gpio.h"
 #include "diag.h"
 #define getvar(str) (nvram_get(str)?:"")
 
 
 #include "gpio.h"
 #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);
 
 enum {
        /* Linksys */
        WAP54GV1,
 static unsigned int gpiomask = 0;
 module_param(gpiomask, int, 0644);
 
 enum {
        /* Linksys */
        WAP54GV1,
+       WAP54GV2,
        WAP54GV3,
        WRT54GV1,
        WRT54G,
        WRTSL54GS,
        WRT54G3G,
        WAP54GV3,
        WRT54GV1,
        WRT54G,
        WRTSL54GS,
        WRT54G3G,
-       
+       WRT54G3GV2_VF,
+       WRT150NV1,
+       WRT150NV11,
+       WRT160NV1,
+       WRT160NV3,
+       WRT300NV11,
+       WRT350N,
+       WRT600N,
+       WRT600NV11,
+       WRT610N,
+       WRT610NV2,
+       E3000V1,
+
        /* ASUS */
        WLHDD,
        WL300G,
        /* ASUS */
        WLHDD,
        WL300G,
+       WL320GE,
+       WL330GE,
        WL500G,
        WL500GD,
        WL500GP,
        WL500G,
        WL500GD,
        WL500GP,
+       WL500GPV2,
+       WL500W,
+       WL520GC,
+       WL520GU,
        ASUS_4702,
        ASUS_4702,
-       
+       WL700GE,
+       RTN16,
+
        /* Buffalo */
        WBR2_G54,
        WHR_G54S,
        WHR_HP_G54,
        /* Buffalo */
        WBR2_G54,
        WHR_G54S,
        WHR_HP_G54,
+       WHR_G125,
        WHR2_A54G54,
        WLA2_G54L,
        WHR2_A54G54,
        WLA2_G54L,
+       WZR_G300N,
+       WZR_RS_G54,
+       WZR_RS_G54HP,
        BUFFALO_UNKNOWN,
        BUFFALO_UNKNOWN_4710,
 
        /* Siemens */
        SE505V1,
        SE505V2,
        BUFFALO_UNKNOWN,
        BUFFALO_UNKNOWN_4710,
 
        /* Siemens */
        SE505V1,
        SE505V2,
-       
+
        /* US Robotics */
        USR5461,
 
        /* Dell */
        TM2300,
        /* US Robotics */
        USR5461,
 
        /* Dell */
        TM2300,
+       TM2300V2,
 
        /* Motorola */
        WE800G,
        WR850GV1,
        WR850GV2V3,
 
        /* Motorola */
        WE800G,
        WR850GV1,
        WR850GV2V3,
+       WR850GP,
 
        /* Belkin */
        BELKIN_UNKNOWN,
 
        /* Belkin */
        BELKIN_UNKNOWN,
+       BELKIN_F7D4301,
+
+       /* Netgear */
+       WGT634U,
+       WNR834BV1,
+       WNR834BV2,
+
+       /* Trendware */
+       TEW411BRPP,
+
+       /* SimpleTech */
+       STI_NAS,
+
+       /* D-Link */
+       DIR130,
+       DIR320,
+       DIR330,
+       DWL3150,
+
+       /* Sitecom */
+       WL105B,
+
+       /* Western Digital */
+       WDNetCenter,
+
+       /* Askey */
+       RT210W,
+
+       /* OvisLink */
+       WL1600GL,
+
+       /* Microsoft */
+       MN700,
+
+       /* Edimax */
+       PS1208MFG,
 };
 
 };
 
+static void __init bcm4780_init(void) {
+               int pin = 1 << 3;
+
+               /* Enables GPIO 3 that controls HDD and led power on ASUS WL-700gE */
+               printk(MODULE_NAME ": Spinning up HDD and enabling leds\n");
+               gpio_outen(pin, pin);
+               gpio_control(pin, 0);
+               gpio_out(pin, pin);
+
+               /* Wait 5s, so the HDD can spin up */
+               set_current_state(TASK_INTERRUPTIBLE);
+               schedule_timeout(HZ * 5);
+}
+
+static void __init NetCenter_init(void) {
+               /* unset pin 6 (+12V) */
+               int pin = 1 << 6;
+               gpio_outen(pin, pin);
+               gpio_control(pin, 0);
+               gpio_out(pin, pin);
+               /* unset pin 1 (turn off red led, blue will light alone if +5V comes up) */
+               pin = 1 << 1;
+               gpio_outen(pin, pin);
+               gpio_control(pin, 0);
+               gpio_out(pin, pin);
+               /* unset pin 3 (+5V) and wait 5 seconds (harddisk spin up) */
+               bcm4780_init();
+}
+
+static void __init bcm57xx_init(void) {
+       int pin = 1 << 2;
+
+       /* FIXME: switch comes up, but port mappings/vlans not right */
+       gpio_outen(pin, pin);
+       gpio_control(pin, 0);
+       gpio_out(pin, pin);
+}
+
 static struct platform_t __initdata platforms[] = {
        /* Linksys */
        [WAP54GV1] = {
 static struct platform_t __initdata platforms[] = {
        /* Linksys */
        [WAP54GV1] = {
@@ -98,11 +196,21 @@ static struct platform_t __initdata platforms[] = {
                .buttons        = {
                        { .name = "reset",      .gpio = 1 << 0 },
                },
                .buttons        = {
                        { .name = "reset",      .gpio = 1 << 0 },
                },
-               .leds           = { 
+               .leds           = {
                        { .name = "diag",       .gpio = 1 << 3 },
                        { .name = "wlan",       .gpio = 1 << 4 },
                },
        },
                        { .name = "diag",       .gpio = 1 << 3 },
                        { .name = "wlan",       .gpio = 1 << 4 },
                },
        },
+       [WAP54GV2] = {
+               .name           = "Linksys WAP54G V2",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 0 },
+               },
+               .leds           = {
+                       { .name = "wlan",       .gpio = 1 << 5, .polarity = REVERSE },
+                       /* GPIO 6 is b44 (eth0, LAN) PHY power */
+               },
+       },
        [WAP54GV3] = {
                .name           = "Linksys WAP54G V3",
                .buttons        = {
        [WAP54GV3] = {
                .name           = "Linksys WAP54G V3",
                .buttons        = {
@@ -110,7 +218,7 @@ static struct platform_t __initdata platforms[] = {
                        { .name = "reset",      .gpio = 1 << 7 },
                        { .name = "ses",        .gpio = 1 << 0 },
                },
                        { .name = "reset",      .gpio = 1 << 7 },
                        { .name = "ses",        .gpio = 1 << 0 },
                },
-               .leds           = { 
+               .leds           = {
                        /* FIXME: diag? */
                        { .name = "ses",        .gpio = 1 << 1 },
                },
                        /* FIXME: diag? */
                        { .name = "ses",        .gpio = 1 << 1 },
                },
@@ -120,7 +228,7 @@ static struct platform_t __initdata platforms[] = {
                .buttons        = {
                        { .name = "reset",      .gpio = 1 << 6 },
                },
                .buttons        = {
                        { .name = "reset",      .gpio = 1 << 6 },
                },
-               .leds           = { 
+               .leds           = {
                        { .name = "diag",       .gpio = 0x13 | GPIO_TYPE_EXTIF, .polarity = NORMAL },
                        { .name = "dmz",        .gpio = 0x12 | GPIO_TYPE_EXTIF, .polarity = NORMAL },
                },
                        { .name = "diag",       .gpio = 0x13 | GPIO_TYPE_EXTIF, .polarity = NORMAL },
                        { .name = "dmz",        .gpio = 0x12 | GPIO_TYPE_EXTIF, .polarity = NORMAL },
                },
@@ -166,6 +274,167 @@ static struct platform_t __initdata platforms[] = {
                        { .name = "3g_blink",   .gpio = 1 << 5, .polarity = NORMAL },
                },
        },
                        { .name = "3g_blink",   .gpio = 1 << 5, .polarity = NORMAL },
                },
        },
+       [WRT54G3GV2_VF] = {
+               .name           = "Linksys WRT54G3GV2-VF",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 6 },
+                       { .name = "3g",         .gpio = 1 << 5 },
+               },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 1, .polarity = NORMAL },
+                       { .name = "3g_green",   .gpio = 1 << 2, .polarity = NORMAL },
+                       { .name = "3g_blue",    .gpio = 1 << 3, .polarity = NORMAL },
+               },
+       },
+       [WRT150NV1] = {
+               .name           = "Linksys WRT150N V1",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 6 },
+                       { .name = "ses",        .gpio = 1 << 4 },
+               },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 1, .polarity = NORMAL },
+                       { .name = "ses_green",  .gpio = 1 << 5, .polarity = REVERSE },
+                       { .name = "ses_amber", .gpio = 1 << 3, .polarity = REVERSE },
+               },
+       },
+       [WRT150NV11] = {
+               .name           = "Linksys WRT150N V1.1",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 6 },
+                       { .name = "ses",        .gpio = 1 << 4 },
+               },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 1, .polarity = NORMAL },
+                       { .name = "ses_green",  .gpio = 1 << 5, .polarity = REVERSE },
+                       { .name = "ses_amber", .gpio = 1 << 3, .polarity = REVERSE },
+               },
+       },
+       [WRT160NV1] = {
+               .name           = "Linksys WRT160N v1.x",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 6 },
+                       { .name = "ses",        .gpio = 1 << 4 },
+               },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 1, .polarity = NORMAL },
+                       { .name = "ses_blue",   .gpio = 1 << 5, .polarity = REVERSE },
+                       { .name = "ses_orange", .gpio = 1 << 3, .polarity = REVERSE },
+               },
+       },
+       [WRT160NV3] = {
+               .name           = "Linksys WRT160N V3",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 6 },
+                       { .name = "ses",        .gpio = 1 << 5 },
+               },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 1, .polarity = NORMAL },
+                       { .name = "ses_blue",   .gpio = 1 << 4, .polarity = REVERSE },
+                       { .name = "ses_orange", .gpio = 1 << 2, .polarity = REVERSE },
+               },
+       },
+       [WRT300NV11] = {
+               .name           = "Linksys WRT300N V1.1",
+               .buttons        = {
+                       { .name = "reset",     .gpio = 1 << 6 }, // "Reset" on back panel
+                       { .name = "ses",       .gpio = 1 << 4 }, // "Reserved" on top panel
+               },
+               .leds           = {
+                       { .name = "power",     .gpio = 1 << 1, .polarity = NORMAL  }, // "Power"
+                       { .name = "ses_amber", .gpio = 1 << 3, .polarity = REVERSE }, // "Security" Amber
+                       { .name = "ses_green", .gpio = 1 << 5, .polarity = REVERSE }, // "Security" Green
+               },
+               .platform_init = bcm57xx_init,
+       },
+       [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_amber",  .gpio = 1 << 3, .polarity = REVERSE },
+                       { .name = "ses_green",  .gpio = 1 << 9, .polarity = REVERSE },
+                       { .name = "usb_blink",  .gpio = 1 << 10, .polarity = REVERSE },
+                       { .name = "usb",        .gpio = 1 << 11, .polarity = REVERSE },
+               },
+               .platform_init = bcm57xx_init,
+       },
+       [WRT600N] = {
+               .name           = "Linksys WRT600N",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 6 },
+                       { .name = "ses",        .gpio = 1 << 7 },
+               },
+               .leds           = {
+                       { .name = "power",              .gpio = 1 << 2,  .polarity = REVERSE }, // Power LED
+                       { .name = "usb",                .gpio = 1 << 3,  .polarity = REVERSE }, // USB LED
+                       { .name = "wl0_ses_amber",      .gpio = 1 << 8,  .polarity = REVERSE }, // 2.4Ghz LED Amber
+                       { .name = "wl0_ses_green",      .gpio = 1 << 9,  .polarity = REVERSE }, // 2.4Ghz LED Green
+                       { .name = "wl1_ses_amber",      .gpio = 1 << 10, .polarity = REVERSE }, // 5.6Ghz LED Amber
+                       { .name = "wl1_ses_green",      .gpio = 1 << 11, .polarity = REVERSE }, // 5.6Ghz LED Green
+               },
+               .platform_init = bcm57xx_init,
+       },
+       [WRT600NV11] = {
+               .name           = "Linksys WRT600N V1.1",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 6 },
+                       { .name = "ses",        .gpio = 1 << 7 },
+               },
+               .leds           = {
+                       { .name = "power",             .gpio = 1 << 2,  .polarity = REVERSE }, // Power LED
+                       { .name = "usb",                .gpio = 1 << 3,  .polarity = REVERSE }, // USB LED
+                       { .name = "wl0_ses_amber",      .gpio = 1 << 8,  .polarity = REVERSE }, // 2.4Ghz LED Amber
+                       { .name = "wl0_ses_green",     .gpio = 1 << 9,  .polarity = REVERSE }, // 2.4Ghz LED Green
+                       { .name = "wl1_ses_amber",      .gpio = 1 << 10, .polarity = REVERSE }, // 5.6Ghz LED Amber
+                       { .name = "wl1_ses_green",      .gpio = 1 << 11, .polarity = REVERSE }, // 5.6Ghz LED Green
+               },
+               .platform_init = bcm57xx_init,
+       },
+       [WRT610N] = {
+               .name           = "Linksys WRT610N",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 6 },
+                       { .name = "ses",        .gpio = 1 << 8 },
+               },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 1,  .polarity = NORMAL }, // Power LED
+                       { .name = "usb",        .gpio = 1 << 0,  .polarity = REVERSE }, // USB LED
+                       { .name = "ses_amber",  .gpio = 1 << 3,  .polarity = REVERSE }, // WiFi protected setup LED amber
+                       { .name = "ses_blue",   .gpio = 1 << 9,  .polarity = REVERSE }, // WiFi protected setup LED blue
+               },
+       },
+       [WRT610NV2] = {
+               .name           = "Linksys WRT610N V2",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 6 },
+                       { .name = "ses",        .gpio = 1 << 4 },
+               },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 5, .polarity = NORMAL },   // Power LED
+                       { .name = "usb",        .gpio = 1 << 7, .polarity = NORMAL },   // USB LED
+                       { .name = "ses_amber",  .gpio = 1 << 0, .polarity = REVERSE },  // WiFi protected setup LED amber
+                       { .name = "ses_blue",   .gpio = 1 << 3, .polarity = REVERSE },  // WiFi protected setup LED blue
+                       { .name = "wlan",       .gpio = 1 << 1, .polarity = NORMAL },   // Wireless LED
+               },
+       },
+       [E3000V1] = {
+               .name           = "Linksys E3000 V1",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 6 },
+                       { .name = "ses",        .gpio = 1 << 4 },
+               },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 5, .polarity = NORMAL },   // Power LED
+                       { .name = "usb",        .gpio = 1 << 7, .polarity = NORMAL },   // USB LED
+                       { .name = "ses_amber",  .gpio = 1 << 0, .polarity = REVERSE },  // WiFi protected setup LED amber
+                       { .name = "ses_blue",   .gpio = 1 << 3, .polarity = REVERSE },  // WiFi protected setup LED blue
+                       { .name = "wlan",       .gpio = 1 << 1, .polarity = NORMAL },   // Wireless LED
+               },
+       },
        /* Asus */
        [WLHDD] = {
                .name           = "ASUS WL-HDD",
        /* Asus */
        [WLHDD] = {
                .name           = "ASUS WL-HDD",
@@ -174,6 +443,7 @@ static struct platform_t __initdata platforms[] = {
                },
                .leds           = {
                        { .name = "power",      .gpio = 1 << 0, .polarity = REVERSE },
                },
                .leds           = {
                        { .name = "power",      .gpio = 1 << 0, .polarity = REVERSE },
+                       { .name = "usb",        .gpio = 1 << 2, .polarity = REVERSE },
                },
        },
        [WL300G] = {
                },
        },
        [WL300G] = {
@@ -185,6 +455,26 @@ static struct platform_t __initdata platforms[] = {
                        { .name = "power",      .gpio = 1 << 0, .polarity = REVERSE },
                },
        },
                        { .name = "power",      .gpio = 1 << 0, .polarity = REVERSE },
                },
        },
+       [WL320GE] = {
+               .name           = "ASUS WL-320gE/WL-320gP",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 6 },
+               },
+               .leds           = {
+                       { .name = "wlan",       .gpio = 1 << 0, .polarity = REVERSE },
+                       { .name = "power",      .gpio = 1 << 2, .polarity = REVERSE },
+                       { .name = "link",       .gpio = 1 << 11, .polarity = REVERSE },
+               },
+       },
+       [WL330GE] = {
+               .name           = "ASUS WL-330gE",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 2 },
+               },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 0, .polarity = REVERSE },
+               },
+       },
        [WL500G] = {
                .name           = "ASUS WL-500g",
                .buttons        = {
        [WL500G] = {
                .name           = "ASUS WL-500g",
                .buttons        = {
@@ -213,6 +503,49 @@ static struct platform_t __initdata platforms[] = {
                        { .name = "power",      .gpio = 1 << 1, .polarity = REVERSE },
                },
        },
                        { .name = "power",      .gpio = 1 << 1, .polarity = REVERSE },
                },
        },
+       [WL500GPV2] = {
+               .name           = "ASUS WL-500g Premium V2",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 2 },
+                       { .name = "ses",        .gpio = 1 << 3 },
+               },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 0, .polarity = REVERSE },
+                       { .name = "wlan",       .gpio = 1 << 1, .polarity = REVERSE },
+               },
+       },
+       [WL500W] = {
+               .name           = "ASUS WL-500W",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 6 },
+                       { .name = "ses",        .gpio = 1 << 7 },
+               },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 5, .polarity = REVERSE },
+               },
+       },
+       [WL520GC] = {
+               .name           = "ASUS WL-520GC",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 2 },
+                       { .name = "ses",        .gpio = 1 << 3 },
+               },
+               .leds           = {
+               { .name = "power",      .gpio = 1 << 0, .polarity = REVERSE },
+                       { .name = "wlan",       .gpio = 1 << 1, .polarity = REVERSE },
+               },
+       },
+       [WL520GU] = {
+               .name           = "ASUS WL-520gU",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 2 },
+                       { .name = "ses",        .gpio = 1 << 3 },
+               },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 0, .polarity = REVERSE },
+                       { .name = "wlan",       .gpio = 1 << 1, .polarity = REVERSE },
+               },
+       },
        [ASUS_4702] = {
                .name           = "ASUS (unknown, BCM4702)",
                .buttons        = {
        [ASUS_4702] = {
                .name           = "ASUS (unknown, BCM4702)",
                .buttons        = {
@@ -222,6 +555,36 @@ static struct platform_t __initdata platforms[] = {
                        { .name = "power",      .gpio = 1 << 0, .polarity = REVERSE },
                },
        },
                        { .name = "power",      .gpio = 1 << 0, .polarity = REVERSE },
                },
        },
+       [WL700GE] = {
+               .name           = "ASUS WL-700gE",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 7 }, // on back, hardwired, always resets device regardless OS state
+                       { .name = "ses",        .gpio = 1 << 4 }, // on back, actual name ezsetup
+                       { .name = "power",      .gpio = 1 << 0 }, // on front
+                       { .name = "copy",       .gpio = 1 << 6 }, // on front
+               },
+               .leds           = {
+#if 0
+                       // GPIO that controls power led also enables/disables some essential functions
+                       // - power to HDD
+                       // - switch leds
+                       { .name = "power",      .gpio = 1 << 3, .polarity = NORMAL },  // actual name power
+#endif
+                       { .name = "diag",       .gpio = 1 << 1, .polarity = REVERSE }, // actual name ready
+               },
+               .platform_init = bcm4780_init,
+       },
+       [RTN16] = {
+               .name           = "ASUS RT-N16",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 8 },
+                       { .name = "ses",        .gpio = 1 << 5 },
+               },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 1, .polarity = REVERSE },
+                       { .name = "wlan",       .gpio = 1 << 7, .polarity = NORMAL },
+               },
+       },
        /* Buffalo */
        [WHR_G54S] = {
                .name           = "Buffalo WHR-G54S",
        /* Buffalo */
        [WHR_G54S] = {
                .name           = "Buffalo WHR-G54S",
@@ -235,6 +598,7 @@ static struct platform_t __initdata platforms[] = {
                        { .name = "internal",   .gpio = 1 << 3, .polarity = REVERSE },
                        { .name = "ses",        .gpio = 1 << 6, .polarity = REVERSE },
                        { .name = "bridge",     .gpio = 1 << 1, .polarity = REVERSE },
                        { .name = "internal",   .gpio = 1 << 3, .polarity = REVERSE },
                        { .name = "ses",        .gpio = 1 << 6, .polarity = REVERSE },
                        { .name = "bridge",     .gpio = 1 << 1, .polarity = REVERSE },
+                       { .name = "wlan",       .gpio = 1 << 2, .polarity = REVERSE },
                },
        },
        [WBR2_G54] = {
                },
        },
        [WBR2_G54] = {
@@ -256,8 +620,25 @@ static struct platform_t __initdata platforms[] = {
                },
                .leds           = {
                        { .name = "diag",       .gpio = 1 << 7, .polarity = REVERSE },
                },
                .leds           = {
                        { .name = "diag",       .gpio = 1 << 7, .polarity = REVERSE },
+                       { .name = "internal",   .gpio = 1 << 3, .polarity = REVERSE },
                        { .name = "bridge",     .gpio = 1 << 1, .polarity = REVERSE },
                        { .name = "ses",        .gpio = 1 << 6, .polarity = REVERSE },
                        { .name = "bridge",     .gpio = 1 << 1, .polarity = REVERSE },
                        { .name = "ses",        .gpio = 1 << 6, .polarity = REVERSE },
+                       { .name = "wlan",       .gpio = 1 << 2, .polarity = REVERSE },
+               },
+       },
+       [WHR_G125] = {
+               .name           = "Buffalo WHR-G125",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 4 },
+                       { .name = "bridge",     .gpio = 1 << 5 },
+                       { .name = "ses",        .gpio = 1 << 0 },
+               },
+               .leds           = {
+                       { .name = "diag",       .gpio = 1 << 7, .polarity = REVERSE },
+                       { .name = "internal",   .gpio = 1 << 3, .polarity = REVERSE },
+                       { .name = "bridge",     .gpio = 1 << 1, .polarity = REVERSE },
+                       { .name = "ses",        .gpio = 1 << 6, .polarity = REVERSE },
+                       { .name = "wlan",       .gpio = 1 << 2, .polarity = REVERSE },
                },
        },
        [WHR2_A54G54] = {
                },
        },
        [WHR2_A54G54] = {
@@ -279,6 +660,41 @@ static struct platform_t __initdata platforms[] = {
                        { .name = "diag",       .gpio = 1 << 1, .polarity = REVERSE },
                },
        },
                        { .name = "diag",       .gpio = 1 << 1, .polarity = REVERSE },
                },
        },
+       [WZR_G300N] = {
+               .name           = "Buffalo WZR-G300N",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 4 },
+               },
+               .leds           = {
+                       { .name = "diag",       .gpio = 1 << 7, .polarity = REVERSE },
+                       { .name = "bridge",     .gpio = 1 << 1, .polarity = REVERSE },
+                       { .name = "ses",        .gpio = 1 << 6, .polarity = REVERSE },
+               },
+       },
+       [WZR_RS_G54] = {
+               .name           = "Buffalo WZR-RS-G54",
+               .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 },
+               },
+       },
+       [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] = {
                .name           = "Buffalo (unknown)",
                .buttons        = {
        [BUFFALO_UNKNOWN] = {
                .name           = "Buffalo (unknown)",
                .buttons        = {
@@ -304,7 +720,8 @@ static struct platform_t __initdata platforms[] = {
                        /* No usable buttons */
                },
                .leds           = {
                        /* No usable buttons */
                },
                .leds           = {
-                       { .name = "dmz",        .gpio = 1 << 4, .polarity = REVERSE },
+//                     { .name = "power",      .gpio = 1 << 0  .polarity = REVERSE },  // Usable when retrofitting D26 (?)
+                       { .name = "dmz",        .gpio = 1 << 4, .polarity = REVERSE },  // actual name WWW
                        { .name = "wlan",       .gpio = 1 << 3, .polarity = REVERSE },
                },
        },
                        { .name = "wlan",       .gpio = 1 << 3, .polarity = REVERSE },
                },
        },
@@ -315,7 +732,7 @@ static struct platform_t __initdata platforms[] = {
                },
                .leds           = {
                        { .name = "power",      .gpio = 1 << 5, .polarity = REVERSE },
                },
                .leds           = {
                        { .name = "power",      .gpio = 1 << 5, .polarity = REVERSE },
-                       { .name = "dmz",        .gpio = 1 << 0, .polarity = REVERSE },
+                       { .name = "dmz",        .gpio = 1 << 0, .polarity = REVERSE },  // actual name WWW
                        { .name = "wlan",       .gpio = 1 << 3, .polarity = REVERSE },
                },
        },
                        { .name = "wlan",       .gpio = 1 << 3, .polarity = REVERSE },
                },
        },
@@ -337,7 +754,18 @@ static struct platform_t __initdata platforms[] = {
                        { .name = "reset",      .gpio = 1 << 0 },
                },
                .leds           = {
                        { .name = "reset",      .gpio = 1 << 0 },
                },
                .leds           = {
-                       { .name = "diag",       .gpio = 1 << 7, .polarity = REVERSE },
+                       { .name = "wlan",       .gpio = 1 << 6, .polarity = REVERSE },
+                       { .name = "power",      .gpio = 1 << 7, .polarity = REVERSE },
+               },
+       },
+       [TM2300V2] = {
+               .name           = "Dell TrueMobile 2300 v2",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 0 },
+               },
+               .leds           = {
+                       { .name = "wlan",       .gpio = 1 << 6, .polarity = REVERSE },
+                       { .name = "power",      .gpio = 1 << 7, .polarity = REVERSE },
                },
        },
        /* Motorola */
                },
        },
        /* Motorola */
@@ -370,6 +798,18 @@ static struct platform_t __initdata platforms[] = {
                .buttons        = {
                        { .name = "reset",      .gpio = 1 << 5 },
                },
                .buttons        = {
                        { .name = "reset",      .gpio = 1 << 5 },
                },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 1, .polarity = NORMAL },
+                       { .name = "wlan",       .gpio = 1 << 0, .polarity = REVERSE },
+                       { .name = "wan",        .gpio = 1 << 6, .polarity = INPUT },
+                       { .name = "diag",       .gpio = 1 << 7, .polarity = REVERSE },
+               },
+       },
+       [WR850GP] = {
+               .name           = "Motorola WR850GP",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 5 },
+               },
                .leds           = {
                        { .name = "power",      .gpio = 1 << 1, .polarity = NORMAL },
                        { .name = "wlan",       .gpio = 1 << 0, .polarity = REVERSE },
                .leds           = {
                        { .name = "power",      .gpio = 1 << 1, .polarity = NORMAL },
                        { .name = "wlan",       .gpio = 1 << 0, .polarity = REVERSE },
@@ -377,6 +817,7 @@ static struct platform_t __initdata platforms[] = {
                        { .name = "diag",       .gpio = 1 << 7, .polarity = REVERSE },
                },
        },
                        { .name = "diag",       .gpio = 1 << 7, .polarity = REVERSE },
                },
        },
+
        /* Belkin */
        [BELKIN_UNKNOWN] = {
                .name           = "Belkin (unknown)",
        /* Belkin */
        [BELKIN_UNKNOWN] = {
                .name           = "Belkin (unknown)",
@@ -390,53 +831,395 @@ static struct platform_t __initdata platforms[] = {
                        { .name = "connected",  .gpio = 1 << 0, .polarity = NORMAL },
                },
        },
                        { .name = "connected",  .gpio = 1 << 0, .polarity = NORMAL },
                },
        },
+       [BELKIN_F7D4301] = {
+               .name           = "Belkin PlayMax F7D4301",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 6 },
+                       { .name = "wps",        .gpio = 1 << 8 },
+               },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 11, .polarity = REVERSE },
+                       { .name = "wlan",       .gpio = 1 << 13, .polarity = REVERSE },
+                       { .name = "led0",       .gpio = 1 << 14, .polarity = REVERSE },
+                       { .name = "led1",       .gpio = 1 << 15, .polarity = REVERSE },
+               },
+       },
+       /* Netgear */
+       [WGT634U] = {
+               .name           = "Netgear WGT634U",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 2 },
+               },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 3, .polarity = NORMAL },
+               },
+       },
+       /* Netgear */
+       [WNR834BV1] = {
+               .name           = "Netgear WNR834B V1",
+               .buttons        = { /* TODO: add reset button and confirm LEDs - GPIO from dd-wrt */ },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 4, .polarity = REVERSE },
+                       { .name = "diag",       .gpio = 1 << 5, .polarity = REVERSE },
+                       { .name = "wlan",       .gpio = 1 << 6, .polarity = REVERSE },
+               },
+       },
+       /* Netgear */
+       [WNR834BV2] = {
+               .name           = "Netgear WNR834B V2",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 6 },
+               },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 2, .polarity = NORMAL },
+                       { .name = "diag",       .gpio = 1 << 3, .polarity = NORMAL },
+                       { .name = "connected",  .gpio = 1 << 7, .polarity = NORMAL },
+               },
+       },
+       /* 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 },
+               },
+       },
+       /* SimpleTech */
+       [STI_NAS] = {
+               .name      = "SimpleTech SimpleShare NAS",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 0 }, // Power button on back, named reset to enable failsafe.
+               },
+               .leds      = {
+                       { .name = "diag",       .gpio = 1 << 1, .polarity = REVERSE }, // actual name ready
+               },
+               .platform_init = bcm4780_init,
+       },
+       /* D-Link */
+       [DIR130] = {
+               .name     = "D-Link DIR-130",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 3},
+                       { .name = "reserved",   .gpio = 1 << 7},
+               },
+               .leds      = {
+                       { .name = "diag",       .gpio = 1 << 0},
+                       { .name = "blue",       .gpio = 1 << 6},
+               },
+       },
+       [DIR320] = {
+               .name     = "D-Link DIR-320",
+               .buttons        = {
+                       { .name = "reserved",   .gpio = 1 << 6},
+                       { .name = "reset",      .gpio = 1 << 7},
+               },
+               .leds      = {
+                       { .name = "wlan",       .gpio = 1 << 0, .polarity = NORMAL },
+                       { .name = "diag",       .gpio = 1 << 1, .polarity = NORMAL }, /* "status led */
+                       { .name = "red",        .gpio = 1 << 3, .polarity = REVERSE },
+                       { .name = "blue",       .gpio = 1 << 4, .polarity = REVERSE },
+                       { .name = "usb",        .gpio = 1 << 5, .polarity = NORMAL },
+               },
+       },
+       [DIR330] = {
+               .name     = "D-Link DIR-330",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 3},
+                       { .name = "reserved",   .gpio = 1 << 7},
+               },
+               .leds      = {
+                       { .name = "diag",       .gpio = 1 << 0},
+                       { .name = "usb",        .gpio = 1 << 4},
+                       { .name = "blue",       .gpio = 1 << 6},
+               },
+       },
+       [DWL3150] = {
+               .name   = "D-Link DWL-3150",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 7},
+               },
+               .leds     = {
+                       { .name = "diag",       .gpio = 1 << 2},
+                       { .name = "status",     .gpio = 1 << 1},
+               },
+       },
+       /* Double check */
+       [WL105B] = {
+               .name   = "Sitecom WL-105b",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 10},
+               },
+               .leds     = {
+                       { .name = "wlan",       .gpio = 1 << 4},
+                       { .name = "power",      .gpio = 1 << 3},
+               },
+       },
+       /* Western Digital Net Center */
+       [WDNetCenter] = {
+               .name   = "Western Digital NetCenter",
+               .buttons        = {
+                       { .name = "power",      .gpio = 1 << 0},
+                       { .name = "reset",      .gpio = 1 << 7},
+               },
+               .platform_init = NetCenter_init,
+       },
+       /* Askey (and clones) */
+       [RT210W] = {
+               .name           = "Askey RT210W",
+               .buttons        = {
+                       /* Power button is hard-wired to hardware reset */
+                       /* but is also connected to GPIO 7 (probably for bootloader recovery)  */
+                       { .name = "power",      .gpio = 1 << 7},
+               },
+               .leds           = {
+                       /* These were verified and named based on Belkin F5D4230-4 v1112 */
+                       { .name = "connected",  .gpio = 1 << 0, .polarity = REVERSE },
+                       { .name = "wlan",       .gpio = 1 << 3, .polarity = REVERSE },
+                       { .name = "power",      .gpio = 1 << 5, .polarity = REVERSE },
+               },
+       },
+       [WL1600GL] = {
+               .name           = "OvisLink WL-1600GL",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 3 },
+                       { .name = "ses",        .gpio = 1 << 4 },
+               },
+               .leds           = {
+                       { .name = "power",      .gpio = 1 << 5, .polarity = REVERSE },
+                       { .name = "wps",        .gpio = 1 << 2, .polarity = REVERSE },
+                       { .name = "wlan",       .gpio = 1 << 1, .polarity = REVERSE },
+                       { .name = "connected",  .gpio = 1 << 0, .polarity = REVERSE },
+               },
+       },
+       /* Microsoft */
+       [MN700] = {
+               .name   = "Microsoft MN-700",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 7 },
+               },
+               .leds     = {
+                       { .name = "power",      .gpio = 1 << 6, .polarity = NORMAL },
+               },
+       },
+       /* Edimax */
+       [PS1208MFG] = {
+               .name   = "Edimax PS-1208MFG",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 4 },
+               },
+               .leds     = {
+                       { .name = "status",     .gpio = 1 << 1, .polarity = NORMAL },
+                       { .name = "wlan",       .gpio = 1 << 0, .polarity = NORMAL },
+               },
+       },
 };
 
 static struct platform_t __init *platform_detect(void)
 {
        char *boardnum, *boardtype, *buf;
 
 };
 
 static struct platform_t __init *platform_detect(void)
 {
        char *boardnum, *boardtype, *buf;
 
+       if (strcmp(getvar("nvram_type"), "cfe") == 0)
+               return &platforms[WGT634U];
+
+       /* Look for a model identifier */
+
+       /* Based on "model_name" */
+       if ((buf = nvram_get("model_name"))) {
+               if (!strcmp(buf, "DIR-130"))
+                       return &platforms[DIR130];
+               if (!strcmp(buf, "DIR-330"))
+                       return &platforms[DIR330];
+       }
+
+       /* Based on "wsc_modelname */
+       if ((buf = nvram_get("wsc_modelname"))) {
+               if (!strcmp(buf, "WRT610N"))
+                       return &platforms[WRT610N];
+       }
+
+       /* Based on "model_no" */
+       if ((buf = nvram_get("model_no"))) {
+               if (startswith(buf,"WL700")) /* WL700* */
+                       return &platforms[WL700GE];
+       }
+
+       /* Based on "hardware_version" */
+       if ((buf = nvram_get("hardware_version"))) {
+               if (startswith(buf,"WL500GPV2-")) /* WL500GPV2-* */
+                       return &platforms[WL500GPV2];
+               if (startswith(buf,"WL520GC-")) /* WL520GU-* */
+                       return &platforms[WL520GC];
+               if (startswith(buf,"WL520GU-")) /* WL520GU-* */
+                       return &platforms[WL520GU];
+               if (startswith(buf,"WL330GE-")) /* WL330GE-* */
+                       return &platforms[WL330GE];
+               if (startswith(buf,"RT-N16-")) /* RT-N16-* */
+                       return &platforms[RTN16];
+               if (startswith(buf,"F7D4301")) /* F7D4301* */
+                       return &platforms[BELKIN_F7D4301];
+       }
+
+       /* Based on "ModelId" */
+       if ((buf = nvram_get("ModelId"))) {
+               if (!strcmp(buf, "WR850GP"))
+                       return &platforms[WR850GP];
+               if (!strcmp(buf, "WR850G"))
+                       return &platforms[WR850GV2V3];
+               if (!strcmp(buf, "WX-5565") && !strcmp(getvar("boardtype"),"bcm94710ap"))
+                       return &platforms[TM2300]; /* Dell TrueMobile 2300 */
+               if (startswith(buf,"WE800G")) /* WE800G* */
+                       return &platforms[WE800G];
+       }
+
+       /* Buffalo */
+       if ((buf = (nvram_get("melco_id") ?: nvram_get("buffalo_id")))) {
+               /* Buffalo hardware, check id for specific hardware matches */
+               if (!strcmp(buf, "29bb0332"))
+                       return &platforms[WBR2_G54];
+               if (!strcmp(buf, "29129"))
+                       return &platforms[WLA2_G54L];
+               if (!strcmp(buf, "30189"))
+                       return &platforms[WHR_HP_G54];
+               if (!strcmp(buf, "32093"))
+                       return &platforms[WHR_G125];
+               if (!strcmp(buf, "30182"))
+                       return &platforms[WHR_G54S];
+               if (!strcmp(buf, "290441dd"))
+                       return &platforms[WHR2_A54G54];
+               if (!strcmp(buf, "31120"))
+                       return &platforms[WZR_G300N];
+               if (!strcmp(buf, "30083"))
+                       return &platforms[WZR_RS_G54];
+               if (!strcmp(buf, "30103"))
+                       return &platforms[WZR_RS_G54HP];
+       }
+
+       /* no easy model number, attempt to guess */
        boardnum = getvar("boardnum");
        boardtype = getvar("boardtype");
        boardnum = getvar("boardnum");
        boardtype = getvar("boardtype");
-       if (strncmp(getvar("pmon_ver"), "CFE", 3) == 0) {
+
+       if (!strcmp(boardnum, "20070615")) { /* Linksys WRT600N  v1/V1.1 */
+               if (!strcmp(boardtype, "0x478") && !strcmp(getvar("cardbus"), "0") && !strcmp(getvar("switch_type"),"BCM5395"))
+                       return &platforms[WRT600NV11];
+
+       if (!strcmp(boardtype, "0x478") && !strcmp(getvar("cardbus"), "0"))
+                       return &platforms[WRT600N];
+       }
+
+       /*
+        * Normally, these would go inside the "CFE based - newer hardware" block below; however, during early init, the
+        * "pmon_ver" variable is not available on the E3000v1 (and probably the WRT610Nv2 also).  Until this is figured out,
+        * these will need to remain here in order for platform detection to work.
+        */
+       if (!strcmp(boardnum, "42")) { /* Linksys */
+               if (!strcmp(boardtype, "0x04cf") && !strcmp(getvar("boot_hw_model"), "E300") && !strcmp(getvar("boot_hw_ver"), "1.0"))
+                       return &platforms[E3000V1];
+
+               if (!strcmp(boardtype, "0x04cf") && !strcmp(getvar("boot_hw_model"), "WRT610N") && !strcmp(getvar("boot_hw_ver"), "2.0"))
+                       return &platforms[WRT610NV2];
+       }
+
+       if (startswith(getvar("pmon_ver"), "CFE")) {
                /* CFE based - newer hardware */
                if (!strcmp(boardnum, "42")) { /* Linksys */
                /* CFE based - newer hardware */
                if (!strcmp(boardnum, "42")) { /* Linksys */
+                       if (!strcmp(boardtype, "0x478") && !strcmp(getvar("boot_hw_model"), "WRT300N") && !strcmp(getvar("boot_hw_ver"), "1.1"))
+                               return &platforms[WRT300NV11];
+
+                       if (!strcmp(boardtype, "0x478") && !strcmp(getvar("cardbus"), "1"))
+                               return &platforms[WRT350N];
+
                        if (!strcmp(boardtype, "0x0101") && !strcmp(getvar("boot_ver"), "v3.6"))
                                return &platforms[WRT54G3G];
 
                        if (!strcmp(boardtype, "0x0101") && !strcmp(getvar("boot_ver"), "v3.6"))
                                return &platforms[WRT54G3G];
 
+                       if (!strcmp(boardtype, "0x042f") && !strcmp(getvar("model_name"), "WRT54G3GV2-VF"))
+                               return &platforms[WRT54G3GV2_VF];
+
                        if (!strcmp(getvar("et1phyaddr"),"5") && !strcmp(getvar("et1mdcport"), "1"))
                                return &platforms[WRTSL54GS];
                        if (!strcmp(getvar("et1phyaddr"),"5") && !strcmp(getvar("et1mdcport"), "1"))
                                return &platforms[WRTSL54GS];
-                       
+
+                       if (!strcmp(boardtype, "0x0472")) {
+                               if(!strcmp(getvar("boot_hw_model"), "WRT150N"))
+                                       if(!strcmp(getvar("boot_hw_ver"), "1"))
+                                               return &platforms[WRT150NV1];
+                                       else if(!strcmp(getvar("boot_hw_ver"), "1.1"))
+                                               return &platforms[WRT150NV11];
+                               else if(!strcmp(getvar("boot_hw_model"), "WRT160N"))
+                                       if(!strcmp(getvar("boot_hw_ver"), "1.0"))
+                                               return &platforms[WRT160NV1];
+                                       else if(!strcmp(getvar("boot_hw_ver"), "3.0"))
+                                               return &platforms[WRT160NV3];
+                       }
+
                        /* default to WRT54G */
                        return &platforms[WRT54G];
                }
                        /* default to WRT54G */
                        return &platforms[WRT54G];
                }
-               
+               if (!strcmp(boardnum, "1024") && !strcmp(boardtype, "0x0446"))
+                       return &platforms[WAP54GV2];
+
+               if (!strcmp(boardnum, "8") && !strcmp(boardtype, "0x048e"))
+                       return &platforms[WL1600GL];
+
+
+               if (!strcmp(boardnum, "44") || !strcmp(boardnum, "44\r")) {
+                       if (!strcmp(boardtype,"0x0101") || !strcmp(boardtype, "0x0101\r"))
+                               return &platforms[TM2300V2]; /* Dell TrueMobile 2300 v2 */
+               }
+
                if (!strcmp(boardnum, "45")) { /* ASUS */
                        if (!strcmp(boardtype,"0x042f"))
                                return &platforms[WL500GP];
                if (!strcmp(boardnum, "45")) { /* ASUS */
                        if (!strcmp(boardtype,"0x042f"))
                                return &platforms[WL500GP];
+                       else if (!strcmp(boardtype,"0x0472"))
+                               return &platforms[WL500W];
+                       else if (!strcmp(boardtype,"0x467"))
+                               return &platforms[WL320GE];
                        else
                                return &platforms[WL500GD];
                }
                        else
                                return &platforms[WL500GD];
                }
-               
+
                if (!strcmp(boardnum, "10496"))
                        return &platforms[USR5461];
                if (!strcmp(boardnum, "10496"))
                        return &platforms[USR5461];
+
+               if (!strcmp(getvar("boardtype"), "0x0101") && !strcmp(getvar("boardrev"), "0x10")) /* SE505V2 With Modified CFE */
+                       return &platforms[SE505V2];
+
+               if (!strcmp(boardtype, "0x048e") && !strcmp(getvar("boardrev"),"0x35") &&
+                               !strcmp(getvar("boardflags"), "0x750")) /* D-Link DIR-320 */
+                       return &platforms[DIR320];
+
+               if (!strncmp(boardnum, "TH",2) && !strcmp(boardtype,"0x042f")) {
+                       return &platforms[WDNetCenter];
+               }
+
+               if (!strcmp(boardtype,"0x0472") && !strcmp(getvar("cardbus"), "1")) { /* Netgear WNR834B  V1 and V2*/
+                       if (!strcmp(boardnum, "08") || !strcmp(boardnum, "8"))
+                               return &platforms[WNR834BV1];
+                       if (!strcmp(boardnum, "01") || !strcmp(boardnum, "1"))
+                               return &platforms[WNR834BV2];
+               }
+
        } else { /* PMON based - old stuff */
                if ((simple_strtoul(getvar("GemtekPmonVer"), NULL, 0) == 9) &&
                        (simple_strtoul(getvar("et0phyaddr"), NULL, 0) == 30)) {
        } else { /* PMON based - old stuff */
                if ((simple_strtoul(getvar("GemtekPmonVer"), NULL, 0) == 9) &&
                        (simple_strtoul(getvar("et0phyaddr"), NULL, 0) == 30)) {
-                       if (!strncmp(getvar("ModelId"),"WE800G", 6))
-                               return &platforms[WE800G];
-                       else
-                               return &platforms[WR850GV1];
+                       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 (!strcmp(boardnum, "42"))
                                return &platforms[WRT54GV1];
                        if (simple_strtoul(boardnum, NULL, 0) == 2)
                                return &platforms[WAP54GV1];
                }
-               if (!strncmp(getvar("hardware_version"), "WL500-", 6))
-                       return &platforms[WL500G];
-               if (!strncmp(getvar("hardware_version"), "WL300-", 6)) {
+               /* MN-700 has also hardware_version 'WL500-...', so use boardnum */
+               if (startswith(getvar("hardware_version"), "WL500-")) {
+                       if (!strcmp(getvar("boardnum"), "mn700"))
+                               return &platforms[MN700];
+                       else
+                               return &platforms[WL500G];
+               }
+               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))
                        /* 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))
@@ -445,40 +1228,55 @@ static struct platform_t __init *platform_detect(void)
                                (simple_strtoul(getvar("et1phyaddr"), NULL, 0) == 10))
                                return &platforms[WL300G];
                }
                                (simple_strtoul(getvar("et1phyaddr"), NULL, 0) == 10))
                                return &platforms[WL300G];
                }
+               /* Sitecom WL-105b */
+               if (startswith(boardnum, "2") && simple_strtoul(getvar("GemtekPmonVer"), NULL, 0) == 1)
+                       return &platforms[WL105B];
 
                /* unknown asus stuff, probably bcm4702 */
 
                /* unknown asus stuff, probably bcm4702 */
-               if (!strncmp(boardnum, "asusX", 5))
+               if (startswith(boardnum, "asusX"))
                        return &platforms[ASUS_4702];
                        return &platforms[ASUS_4702];
-       }
 
 
-       if ((buf = (nvram_get("melco_id") ?: nvram_get("buffalo_id")))) {
-               /* Buffalo hardware, check id for specific hardware matches */
-               if (!strcmp(buf, "29bb0332"))
-                       return &platforms[WBR2_G54];
-               if (!strcmp(buf, "29129"))
-                       return &platforms[WLA2_G54L];
-               if (!strcmp(buf, "30189"))
-                       return &platforms[WHR_HP_G54];
-               if (!strcmp(buf, "30182"))
-                       return &platforms[WHR_G54S];
-               if (!strcmp(buf, "290441dd"))
-                       return &platforms[WHR2_A54G54];
+               /* bcm4702 based Askey RT210W clones, Including:
+                * Askey RT210W (duh?)
+                * Siemens SE505v1
+                * Belkin F5D7230-4 before version v1444 (MiniPCI slot, not integrated)
+                */
+               if (!strcmp(boardtype,"bcm94710r4")
+                && !strcmp(boardnum ,"100")
+                && !strcmp(getvar("pmon_ver"),"v1.03.12.bk")
+                  ){
+                       return &platforms[RT210W];
+               }
        }
 
        if (buf || !strcmp(boardnum, "00")) {/* probably buffalo */
        }
 
        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];
        }
 
                        return &platforms[BUFFALO_UNKNOWN_4710];
                else
                        return &platforms[BUFFALO_UNKNOWN];
        }
 
-
-       if (!strcmp(getvar("CFEver"), "MotoWRv203") ||
+       if (startswith(getvar("CFEver"), "MotoWRv2") ||
+               startswith(getvar("CFEver"), "MotoWRv3") ||
                !strcmp(getvar("MOTO_BOARD_TYPE"), "WR_FEM1")) {
 
                return &platforms[WR850GV2V3];
        }
 
                !strcmp(getvar("MOTO_BOARD_TYPE"), "WR_FEM1")) {
 
                return &platforms[WR850GV2V3];
        }
 
+       if (!strcmp(boardnum, "44") && !strcmp(getvar("boardflags"),"0x0388")) {  /* Trendware TEW-411BRP+ */
+               return &platforms[TEW411BRPP];
+       }
+
+       if (startswith(boardnum, "04FN")) /* SimpleTech SimpleShare */
+               return &platforms[STI_NAS];
+
+       if (!strcmp(boardnum, "10") && !strcmp(getvar("boardrev"), "0x13")) /* D-Link DWL-3150 */
+               return &platforms[DWL3150];
+
+       if (!strcmp(boardnum, "01") && !strcmp(boardtype, "0x048e") && /* Edimax PS1208MFG */
+               !strcmp(getvar("status_gpio"), "1")) /* gpio based detection */
+               return &platforms[PS1208MFG];
+
        /* not found */
        return NULL;
 }
        /* not found */
        return NULL;
 }
@@ -494,29 +1292,69 @@ static void register_buttons(struct button_t *b)
        gpio_control(platform.button_mask, 0);
        platform.button_polarity = gpio_in() & platform.button_mask;
        gpio_intpolarity(platform.button_mask, platform.button_polarity);
        gpio_control(platform.button_mask, 0);
        platform.button_polarity = gpio_in() & platform.button_mask;
        gpio_intpolarity(platform.button_mask, platform.button_polarity);
-       gpio_intmask(platform.button_mask, platform.button_mask);
+       gpio_setintmask(platform.button_mask, platform.button_mask);
 
        gpio_set_irqenable(1, button_handler);
 }
 
 static void unregister_buttons(struct button_t *b)
 {
 
        gpio_set_irqenable(1, button_handler);
 }
 
 static void unregister_buttons(struct button_t *b)
 {
-       gpio_intmask(platform.button_mask, 0);
+       gpio_setintmask(platform.button_mask, 0);
 
        gpio_set_irqenable(0, button_handler);
 }
 
 
        gpio_set_irqenable(0, button_handler);
 }
 
-static void hotplug_button(struct event_t *event)
+
+static void add_msg(struct event_t *event, char *msg, int argv)
 {
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-       call_usermodehelper (event->argv[0], event->argv, event->envp, 1);
-#else
-       call_usermodehelper (event->argv[0], event->argv, event->envp);
-#endif
+       char *s;
+
+       if (argv)
+               return;
+
+       s = skb_put(event->skb, strlen(msg) + 1);
+       strcpy(s, msg);
+}
+
+static void hotplug_button(struct work_struct *work)
+{
+       struct event_t *event = container_of(work, struct event_t, wq);
+       char *s;
+
+       event->skb = alloc_skb(2048, GFP_KERNEL);
+
+       s = skb_put(event->skb, strlen(event->action) + 2);
+       sprintf(s, "%s@", event->action);
+       fill_event(event);
+
+       NETLINK_CB(event->skb).dst_group = 1;
+       broadcast_uevent(event->skb, 0, 1, GFP_KERNEL);
+
        kfree(event);
 }
 
        kfree(event);
 }
 
-static irqreturn_t button_handler(int irq, void *dev_id, struct pt_regs *regs)
+
+static int fill_event (struct event_t *event)
+{
+       static char buf[128];
+
+       add_msg(event, "HOME=/", 0);
+       add_msg(event, "PATH=/sbin:/bin:/usr/sbin:/usr/bin", 0);
+       add_msg(event, "SUBSYSTEM=button", 0);
+       snprintf(buf, 128, "ACTION=%s", event->action);
+       add_msg(event, buf, 0);
+       snprintf(buf, 128, "BUTTON=%s", event->name);
+       add_msg(event, buf, 0);
+       snprintf(buf, 128, "SEEN=%ld", event->seen);
+       add_msg(event, buf, 0);
+       snprintf(buf, 128, "SEQNUM=%llu", uevent_next_seqnum());
+       add_msg(event, buf, 0);
+
+       return 0;
+}
+
+
+static irqreturn_t button_handler(int irq, void *dev_id)
 {
        struct button_t *b;
        u32 in, changed;
 {
        struct button_t *b;
        u32 in, changed;
@@ -526,34 +1364,20 @@ static irqreturn_t button_handler(int irq, void *dev_id, struct pt_regs *regs)
        changed = platform.button_polarity ^ in;
        platform.button_polarity = in;
 
        changed = platform.button_polarity ^ in;
        platform.button_polarity = in;
 
-       for (b = platform.buttons; b->name; b++) { 
+       changed &= ~gpio_outen(0, 0);
+
+       for (b = platform.buttons; b->name; b++) {
                struct event_t *event;
 
                if (!(b->gpio & changed)) continue;
 
                b->pressed ^= 1;
 
                struct event_t *event;
 
                if (!(b->gpio & changed)) continue;
 
                b->pressed ^= 1;
 
-               if ((event = (struct event_t *)kmalloc (sizeof(struct event_t), GFP_ATOMIC))) {
-                       int i;
-                       char *scratch = event->buf;
-
-                       i = 0;
-                       event->argv[i++] = hotplug_path;
-                       event->argv[i++] = "button";
-                       event->argv[i] = 0;
-
-                       i = 0;
-                       event->envp[i++] = "HOME=/";
-                       event->envp[i++] = "PATH=/sbin:/bin:/usr/sbin:/usr/bin";
-                       event->envp[i++] = scratch;
-                       scratch += sprintf (scratch, "ACTION=%s", b->pressed?"pressed":"released") + 1;
-                       event->envp[i++] = scratch;
-                       scratch += sprintf (scratch, "BUTTON=%s", b->name) + 1;
-                       event->envp[i++] = scratch;
-                       scratch += sprintf (scratch, "SEEN=%ld", (jiffies - b->seen)/HZ) + 1;
-                       event->envp[i] = 0;
-
-                       INIT_WORK(&event->wq, (void *)(void *)hotplug_button, (void *)event);
+               if ((event = (struct event_t *)kzalloc (sizeof(struct event_t), GFP_ATOMIC))) {
+                       event->seen = (jiffies - b->seen)/HZ;
+                       event->name = b->name;
+                       event->action = b->pressed ? "pressed" : "released";
+                       INIT_WORK(&event->wq, (void *)(void *)hotplug_button);
                        schedule_work(&event->wq);
                }
 
                        schedule_work(&event->wq);
                }
 
@@ -566,24 +1390,28 @@ static void register_leds(struct led_t *l)
 {
        struct proc_dir_entry *p;
        u32 mask = 0;
 {
        struct proc_dir_entry *p;
        u32 mask = 0;
+       u32 oe_mask = 0;
        u32 val = 0;
 
        leds = proc_mkdir("led", diag);
        u32 val = 0;
 
        leds = proc_mkdir("led", diag);
-       if (!leds) 
+       if (!leds)
                return;
 
        for(; l->name; l++) {
                if (l->gpio & gpiomask)
                        continue;
                return;
 
        for(; l->name; l++) {
                if (l->gpio & gpiomask)
                        continue;
-       
+
                if (l->gpio & GPIO_TYPE_EXTIF) {
                        l->state = 0;
                        set_led_extif(l);
                } else {
                if (l->gpio & GPIO_TYPE_EXTIF) {
                        l->state = 0;
                        set_led_extif(l);
                } else {
+                       if (l->polarity != INPUT) oe_mask |= l->gpio;
                        mask |= l->gpio;
                        val |= (l->polarity == NORMAL)?0:l->gpio;
                }
 
                        mask |= l->gpio;
                        val |= (l->polarity == NORMAL)?0:l->gpio;
                }
 
+               if (l->polarity == INPUT) continue;
+
                if ((p = create_proc_entry(l->name, S_IRUSR, leds))) {
                        l->proc.type = PROC_LED;
                        l->proc.ptr = l;
                if ((p = create_proc_entry(l->name, S_IRUSR, leds))) {
                        l->proc.type = PROC_LED;
                        l->proc.ptr = l;
@@ -592,9 +1420,10 @@ static void register_leds(struct led_t *l)
                }
        }
 
                }
        }
 
-       gpio_outen(mask, mask);
+       gpio_outen(mask, oe_mask);
        gpio_control(mask, 0);
        gpio_out(mask, val);
        gpio_control(mask, 0);
        gpio_out(mask, val);
+       gpio_setintmask(mask, 0);
 }
 
 static void unregister_leds(struct led_t *l)
 }
 
 static void unregister_leds(struct led_t *l)
@@ -642,18 +1471,13 @@ static void led_flash(unsigned long dummy) {
 
 static ssize_t diag_proc_read(struct file *file, char *buf, size_t count, loff_t *ppos)
 {
 
 static ssize_t diag_proc_read(struct file *file, char *buf, size_t count, loff_t *ppos)
 {
-#ifdef LINUX_2_4
-       struct inode *inode = file->f_dentry->d_inode;
-       struct proc_dir_entry *dent = inode->u.generic_ip;
-#else
        struct proc_dir_entry *dent = PDE(file->f_dentry->d_inode);
        struct proc_dir_entry *dent = PDE(file->f_dentry->d_inode);
-#endif
        char *page;
        int len = 0;
        char *page;
        int len = 0;
-       
+
        if ((page = kmalloc(1024, GFP_KERNEL)) == NULL)
                return -ENOBUFS;
        if ((page = kmalloc(1024, GFP_KERNEL)) == NULL)
                return -ENOBUFS;
-       
+
        if (dent->data != NULL) {
                struct prochandler_t *handler = (struct prochandler_t *) dent->data;
                switch (handler->type) {
        if (dent->data != NULL) {
                struct prochandler_t *handler = (struct prochandler_t *) dent->data;
                switch (handler->type) {
@@ -693,18 +1517,14 @@ static ssize_t diag_proc_read(struct file *file, char *buf, size_t count, loff_t
                len = 0;
        }
 
                len = 0;
        }
 
+       kfree(page);
        return len;
 }
 
 
 static ssize_t diag_proc_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
 {
        return len;
 }
 
 
 static ssize_t diag_proc_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
 {
-#ifdef LINUX_2_4
-       struct inode *inode = file->f_dentry->d_inode;
-       struct proc_dir_entry *dent = inode->u.generic_ip;
-#else
        struct proc_dir_entry *dent = PDE(file->f_dentry->d_inode);
        struct proc_dir_entry *dent = PDE(file->f_dentry->d_inode);
-#endif
        char *page;
        int ret = -EINVAL;
 
        char *page;
        int ret = -EINVAL;
 
@@ -716,14 +1536,14 @@ static ssize_t diag_proc_write(struct file *file, const char *buf, size_t count,
                return -EINVAL;
        }
        page[count] = 0;
                return -EINVAL;
        }
        page[count] = 0;
-       
+
        if (dent->data != NULL) {
                struct prochandler_t *handler = (struct prochandler_t *) dent->data;
                switch (handler->type) {
                        case PROC_LED: {
                                struct led_t *led = (struct led_t *) handler->ptr;
                                int p = (led->polarity == NORMAL ? 0 : 1);
        if (dent->data != NULL) {
                struct prochandler_t *handler = (struct prochandler_t *) dent->data;
                switch (handler->type) {
                        case PROC_LED: {
                                struct led_t *led = (struct led_t *) handler->ptr;
                                int p = (led->polarity == NORMAL ? 0 : 1);
-                               
+
                                if (page[0] == 'f') {
                                        led->flash = 1;
                                        led_flash(0);
                                if (page[0] == 'f') {
                                        led->flash = 1;
                                        led_flash(0);
@@ -774,6 +1594,9 @@ static int __init diag_init(void)
        memcpy(&platform, detected, sizeof(struct platform_t));
 
        printk(MODULE_NAME ": Detected '%s'\n", platform.name);
        memcpy(&platform, detected, sizeof(struct platform_t));
 
        printk(MODULE_NAME ": Detected '%s'\n", platform.name);
+       if (platform.platform_init != NULL) {
+               platform.platform_init();
+       }
 
        if (!(diag = proc_mkdir("diag", NULL))) {
                printk(MODULE_NAME ": proc_mkdir on /proc/diag failed\n");
 
        if (!(diag = proc_mkdir("diag", NULL))) {
                printk(MODULE_NAME ": proc_mkdir on /proc/diag failed\n");
@@ -801,7 +1624,6 @@ static int __init diag_init(void)
 
 static void __exit diag_exit(void)
 {
 
 static void __exit diag_exit(void)
 {
-
        del_timer(&led_timer);
 
        if (platform.buttons)
        del_timer(&led_timer);
 
        if (platform.buttons)
Personal OpenWRT clone
This page took 0.054657 seconds and 4 git commands to generate.