ramips: default profile fix

[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 620f291..55dfa75 100644 (file)
--- a/package/broadcom-diag/src/diag.c
+++ b/package/broadcom-diag/src/diag.c
@@ -30,8 +30,8 @@
 #include <linux/workqueue.h>
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
 #include <linux/workqueue.h>
 #include <linux/skbuff.h>
 #include <linux/netlink.h>

+#include <linux/kobject.h>

 #include <net/sock.h>
 #include <net/sock.h>

-extern struct sock *uevent_sock;

 extern u64 uevent_next_seqnum(void);
 
 #include "gpio.h"
 extern u64 uevent_next_seqnum(void);
 
 #include "gpio.h"


@@ -138,6 +138,9 @@ enum {
 
        /* Microsoft */
        MN700,
 
        /* Microsoft */
        MN700,

+
+       /* Edimax */
+       PS1208MFG,

 };
 
 static void __init bcm4780_init(void) {
 };
 
 static void __init bcm4780_init(void) {


@@ -782,8 +785,7 @@ static struct platform_t __initdata platforms[] = {
        [STI_NAS] = {
                .name      = "SimpleTech SimpleShare NAS",
                .buttons        = {
        [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
+                       { .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
                },
                .leds      = {
                        { .name = "diag",       .gpio = 1 << 1, .polarity = REVERSE }, // actual name ready


@@ -896,6 +898,17 @@ static struct platform_t __initdata platforms[] = {
                        { .name = "power",      .gpio = 1 << 6, .polarity = NORMAL },
                },
        },
                        { .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)
 };
 
 static struct platform_t __init *platform_detect(void)


@@ -1047,7 +1060,7 @@ static struct platform_t __init *platform_detect(void)
                        return &platforms[WDNetCenter];
                }
 
                        return &platforms[WDNetCenter];
                }
 

-               if (!strcmp(boardnum, "08") || !strcmp(boardnum, "01") &&         
+               if ((!strcmp(boardnum, "08") || !strcmp(boardnum, "01")) &&

                                !strcmp(boardtype,"0x0472") && !strcmp(getvar("cardbus"), "1")) { /* Netgear WNR834B  V1 and V2*/
                        /* TODO: Check for version. Default platform is V2 for now. */
                        return &platforms[WNR834BV2];
                                !strcmp(boardtype,"0x0472") && !strcmp(getvar("cardbus"), "1")) { /* Netgear WNR834B  V1 and V2*/
                        /* TODO: Check for version. Default platform is V2 for now. */
                        return &platforms[WNR834BV2];


@@ -1122,9 +1135,13 @@ static struct platform_t __init *platform_detect(void)
        if (startswith(boardnum, "04FN")) /* SimpleTech SimpleShare */
                return &platforms[STI_NAS];
 
        if (startswith(boardnum, "04FN")) /* SimpleTech SimpleShare */
                return &platforms[STI_NAS];
 

-       if (!strcmp(getvar("boardnum"), "10") && !strcmp(getvar("boardrev"), "0x13")) /* D-Link DWL-3150 */
+       if (!strcmp(boardnum, "10") && !strcmp(getvar("boardrev"), "0x13")) /* D-Link DWL-3150 */

                return &platforms[DWL3150];
 
                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;
 }


@@ -1169,9 +1186,6 @@ static void hotplug_button(struct work_struct *work)
        struct event_t *event = container_of(work, struct event_t, wq);
        char *s;
 
        struct event_t *event = container_of(work, struct event_t, wq);
        char *s;
 

-       if (!uevent_sock)
-               return;
-

        event->skb = alloc_skb(2048, GFP_KERNEL);
 
        s = skb_put(event->skb, strlen(event->action) + 2);
        event->skb = alloc_skb(2048, GFP_KERNEL);
 
        s = skb_put(event->skb, strlen(event->action) + 2);


@@ -1179,7 +1193,7 @@ static void hotplug_button(struct work_struct *work)
        fill_event(event);
 
        NETLINK_CB(event->skb).dst_group = 1;
        fill_event(event);
 
        NETLINK_CB(event->skb).dst_group = 1;

-       netlink_broadcast(uevent_sock, event->skb, 0, 1, GFP_KERNEL);
+       broadcast_uevent(event->skb, 0, 1, GFP_KERNEL);

 
        kfree(event);
 }
 
        kfree(event);
 }