awx: improve memory allocation 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 66e86cc..2441ce9 100644 (file)
--- a/package/broadcom-diag/src/diag.c
+++ b/package/broadcom-diag/src/diag.c
@@ -62,7 +62,9 @@ enum {
        WL500G,
        WL500GD,
        WL500GP,
+       WL500W,
        ASUS_4702,
+       WL700GE,
        
        /* Buffalo */
        WBR2_G54,
@@ -99,8 +101,25 @@ enum {
 
        /* Trendware */
        TEW411BRPP,
+       
+       /* SimpleTech */
+       STI_NAS,
 };
 
+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 struct platform_t __initdata platforms[] = {
        /* Linksys */
        [WAP54GV1] = {
@@ -235,6 +254,16 @@ static struct platform_t __initdata platforms[] = {
                        { .name = "power",      .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 },
+               },
+       },
        [ASUS_4702] = {
                .name           = "ASUS (unknown, BCM4702)",
                .buttons        = {
@@ -244,6 +273,25 @@ static struct platform_t __initdata platforms[] = {
                        { .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,
+       },
        /* Buffalo */
        [WHR_G54S] = {
                .name           = "Buffalo WHR-G54S",
@@ -455,7 +503,7 @@ static struct platform_t __initdata platforms[] = {
                        { .name = "reset",      .gpio = 1 << 2 },
                },
                .leds           = {
-                       { .name = "power",      .gpio = 1 << 3, .polarity = REVERSE },
+                       { .name = "power",      .gpio = 1 << 3, .polarity = NORMAL },
                },
        },
        /* Trendware */
@@ -470,6 +518,18 @@ static struct platform_t __initdata platforms[] = {
                        { .name = "bridge",     .gpio = 1 << 6, .polarity = NORMAL },
                },
        },
+       /* SimpleTech */
+       [STI_NAS] = {
+               .name      = "SimpleTech SimpleShare NAS",
+               .buttons        = {
+                       { .name = "reset",      .gpio = 1 << 7 }, // on back, hardwired, always resets device regardless OS state
+                       { .name = "power",      .gpio = 1 << 0 }, // on back
+               },
+               .leds      = {
+                       { .name = "diag",       .gpio = 1 << 1, .polarity = REVERSE }, // actual name ready
+               },
+               .platform_init = bcm4780_init,
+       },
 };
 
 static struct platform_t __init *platform_detect(void)
@@ -478,10 +538,17 @@ static struct platform_t __init *platform_detect(void)
 
        boardnum = getvar("boardnum");
        boardtype = getvar("boardtype");
+
+       if (strcmp(getvar("nvram_type"), "cfe") == 0)
+               return &platforms[WGT634U];
+       
+       if (strncmp(getvar("model_no"), "WL700",5) == 0)
+               return &platforms[WL700GE];
+
        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))
+                       if (!strcmp(boardtype, "0x478") && !strcmp(getvar("cardbus"), "1"))
                                return &platforms[WRT350N];
 
                        if (!strcmp(boardtype, "0x0101") && !strcmp(getvar("boot_ver"), "v3.6"))
@@ -497,6 +564,8 @@ static struct platform_t __init *platform_detect(void)
                if (!strcmp(boardnum, "45")) { /* ASUS */
                        if (!strcmp(boardtype,"0x042f"))
                                return &platforms[WL500GP];
+                       else if (!strcmp(boardtype,"0x0472"))
+                               return &platforms[WL500W];
                        else
                                return &platforms[WL500GD];
                }
@@ -576,6 +645,9 @@ static struct platform_t __init *platform_detect(void)
                return &platforms[TEW411BRPP];
        }
 
+       if (!strncmp(boardnum, "04FN52", 6)) /* SimpleTech SimpleShare */
+               return &platforms[STI_NAS];
+
        /* not found */
        return NULL;
 }
@@ -873,6 +945,9 @@ static int __init diag_init(void)
        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");