cleanup MTD option handling

[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 5ffa68f..96894da 100644 (file)
--- a/package/broadcom-diag/src/diag.c
+++ b/package/broadcom-diag/src/diag.c
@@ -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.
  *
  * 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>


@@ -68,6 +67,7 @@ enum {
        WLHDD,
        WL300G,
        WL320GE,
        WLHDD,
        WL300G,
        WL320GE,

+       WL330GE,

        WL500G,
        WL500GD,
        WL500GP,
        WL500G,
        WL500GD,
        WL500GP,


@@ -307,6 +307,15 @@ static struct platform_t __initdata platforms[] = {
                        { .name = "link",       .gpio = 1 << 11, .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        = {


@@ -764,6 +773,8 @@ static struct platform_t __init *platform_detect(void)
                        return &platforms[WL520GC];
                if (startswith(buf,"WL520GU-")) /* WL520GU-* */
                        return &platforms[WL520GU];
                        return &platforms[WL520GC];
                if (startswith(buf,"WL520GU-")) /* WL520GU-* */
                        return &platforms[WL520GU];

+               if (startswith(buf,"WL330GE-")) /* WL330GE-* */
+                       return &platforms[WL330GE];

        }
 
        /* Based on "ModelId" */
        }
 
        /* Based on "ModelId" */


@@ -919,14 +930,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_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);
 }


@@ -1101,7 +1112,7 @@ static void register_leds(struct led_t *l)
        gpio_outen(mask, oe_mask);
        gpio_control(mask, 0);
        gpio_out(mask, val);
        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)
 }
 
 static void unregister_leds(struct led_t *l)