other.mk/kmod-bluetooth: select kmod-usb-core, required for hci-usb

[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..52e84fa 100644 (file)
--- a/package/broadcom-diag/src/diag.h
+++ b/package/broadcom-diag/src/diag.h
@@ -24,12 +24,13 @@
 #include <linux/irq.h>
 #define MODULE_NAME "diag"
 
 #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,
 #define FLASH_TIME HZ/6
 
 enum polarity_t {
        REVERSE = 0,
        NORMAL = 1,

+       INPUT = 2,

 };
 
 enum {
 };
 
 enum {


@@ -74,9 +75,16 @@ struct platform_t {
 
 struct event_t {
        struct work_struct wq;
 
 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);
 };
 
 extern char *nvram_get(char *str);


@@ -88,12 +96,13 @@ static struct platform_t platform;
 static void register_buttons(struct button_t *b);
 static void unregister_buttons(struct button_t *b);
 
 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)
+#ifndef LINUX_2_4

 static void hotplug_button(struct work_struct *work);
 static void hotplug_button(struct work_struct *work);

+static irqreturn_t button_handler(int irq, void *dev_id);

 #else
 static void hotplug_button(struct event_t *event);
 #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, struct pt_regs *regs);

+#endif

 
 /* leds */
 
 
 /* leds */