brcm47xx: update bcma and ssb to master-2011-07-21

[openwrt.git] / package / broadcom-diag / src / diag.h

diff --git a/package/broadcom-diag/src/diag.h b/package/broadcom-diag/src/diag.h
index 9b6dc36..698c376 100644 (file)
--- a/package/broadcom-diag/src/diag.h
+++ b/package/broadcom-diag/src/diag.h
@@ -18,18 +18,18 @@
  * 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/irq.h>
 #define MODULE_NAME "diag"
 
-#define MAX_GPIO 8
+#define MAX_GPIO 16
 #define FLASH_TIME HZ/6
 
 enum polarity_t {
        REVERSE = 0,
        NORMAL = 1,
+       INPUT = 2,
 };
 
 enum {
@@ -74,9 +74,16 @@ struct platform_t {
 
 struct event_t {
        struct work_struct wq;
-       char buf[256];
-       char *argv[3];
-       char *envp[6];
+       unsigned long seen;
+       char *name, *action;
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+       struct sk_buff *skb;
+#else
+       char *scratch;
+       char *argv[4];
+       char *envp[7];
+       u8 enr, anr;
+#endif
 };
 
 extern char *nvram_get(char *str);
@@ -88,12 +95,8 @@ static struct platform_t platform;
 static void register_buttons(struct button_t *b);
 static void unregister_buttons(struct button_t *b);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
 static void hotplug_button(struct work_struct *work);
-#else
-static void hotplug_button(struct event_t *event);
-#endif
-static irqreturn_t button_handler(int irq, void *dev_id, struct pt_regs *regs);
+static irqreturn_t button_handler(int irq, void *dev_id);
 
 /* leds */