merge the control file and the .ipk file targets into one to prevent them from going...
[openwrt.git] / package / broadcom-diag / src / diag.c
index 5ffa68f..ca08e46 100644 (file)
@@ -19,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.
  *
- * $Id$
  */
 #include <linux/module.h>
 #include <linux/pci.h>
@@ -55,11 +54,13 @@ module_param(gpiomask, int, 0644);
 enum {
        /* Linksys */
        WAP54GV1,
+       WAP54GV2,
        WAP54GV3,
        WRT54GV1,
        WRT54G,
        WRTSL54GS,
        WRT54G3G,
+       WRT160N,
        WRT350N,
        WRT600N,
        WRT600NV11,
@@ -68,6 +69,7 @@ enum {
        WLHDD,
        WL300G,
        WL320GE,
+       WL330GE,
        WL500G,
        WL500GD,
        WL500GP,
@@ -122,6 +124,7 @@ enum {
 
        /* D-Link */
        DIR130,
+       DIR320,
        DIR330,
        DWL3150,
 
@@ -166,6 +169,16 @@ static struct platform_t __initdata platforms[] = {
                        { .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        = {
@@ -229,6 +242,18 @@ static struct platform_t __initdata platforms[] = {
                        { .name = "3g_blink",   .gpio = 1 << 5, .polarity = NORMAL },
                },
        },
+       [WRT160N] = {
+               .name           = "Linksys WRT160N",
+               .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 },
+               },
+       },
        [WRT350N] = {
                .name           = "Linksys WRT350N",
                .buttons        = {
@@ -307,6 +332,15 @@ static struct platform_t __initdata platforms[] = {
                        { .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        = {
@@ -698,6 +732,20 @@ static struct platform_t __initdata platforms[] = {
                        { .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        = {
@@ -764,12 +812,16 @@ static struct platform_t __init *platform_detect(void)
                        return &platforms[WL520GC];
                if (startswith(buf,"WL520GU-")) /* WL520GU-* */
                        return &platforms[WL520GU];
+               if (startswith(buf,"WL330GE-")) /* WL330GE-* */
+                       return &platforms[WL330GE];
        }
 
        /* 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* */
@@ -823,9 +875,14 @@ static struct platform_t __init *platform_detect(void)
                        if (!strcmp(getvar("et1phyaddr"),"5") && !strcmp(getvar("et1mdcport"), "1"))
                                return &platforms[WRTSL54GS];
 
+                       if (!strcmp(boardtype, "0x0472"))
+                               return &platforms[WRT160N];
+
                        /* default to WRT54G */
                        return &platforms[WRT54G];
                }
+               if (!strcmp(boardnum, "1024") && !strcmp(boardtype, "0x0446"))
+                       return &platforms[WAP54GV2];
 
                if (!strcmp(boardnum, "44") || !strcmp(boardnum, "44\r")) {
                        if (!strcmp(boardtype,"0x0101") || !strcmp(boardtype, "0x0101\r"))
@@ -849,6 +906,10 @@ static struct platform_t __init *platform_detect(void)
                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];
+
        } else { /* PMON based - old stuff */
                if ((simple_strtoul(getvar("GemtekPmonVer"), NULL, 0) == 9) &&
                        (simple_strtoul(getvar("et0phyaddr"), NULL, 0) == 30)) {
@@ -919,14 +980,14 @@ 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_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_intmask(platform.button_mask, 0);
+       gpio_setintmask(platform.button_mask, 0);
 
        gpio_set_irqenable(0, button_handler);
 }
@@ -1101,7 +1162,7 @@ static void register_leds(struct led_t *l)
        gpio_outen(mask, oe_mask);
        gpio_control(mask, 0);
        gpio_out(mask, val);
-       gpio_intmask(mask, 0);
+       gpio_setintmask(mask, 0);
 }
 
 static void unregister_leds(struct led_t *l)
This page took 0.027414 seconds and 4 git commands to generate.