Hello Dmitry,
I wonder if you're satisfied with Roman patch now. I guess it could
just fall to the bottom of your queue due to bad formatting. So, here's resend,
hopefully correct. One change is that we had to put "type" member to the end of
struct gpio_keys_button, the reason is backwards compatibility. As you see,
we'd like EV_KEY to be still default, and nay other type to be used only if
explicitly specified. And as structure is already big, and there're usually
several keys to define, we use positional initialization to save space:
{ KEY_ENTER, GPIO_NR_H4000_ACTION_BUTTON_N, 1, "Action button"
},
So, putting type after keycode will break this, and moreover compiler issues
only warning, so that may go unnoticed.
Thanks,
Paul
-------------
This patch adds switch event support to gpio_keys driver.
Signed-off-by: Roman Moravcik <[EMAIL PROTECTED]>
Signed-off-by: Paul Sokolovsky <[EMAIL PROTECTED]>
Index: include/linux/gpio_keys.h
===================================================================
RCS file: /cvs/linux/kernel26/include/linux/gpio_keys.h,v
retrieving revision 1.1
diff -u -p -r1.1 gpio_keys.h
--- include/linux/gpio_keys.h 25 Feb 2007 15:21:52 -0000 1.1
+++ include/linux/gpio_keys.h 13 Apr 2007 21:07:03 -0000
@@ -6,6 +6,7 @@ struct gpio_keys_button {
int gpio;
int active_low;
char *desc;
+ int type;
};
struct gpio_keys_platform_data {
Index: drivers/input/keyboard/gpio_keys.c
===================================================================
RCS file: /cvs/linux/kernel26/drivers/input/keyboard/gpio_keys.c,v
retrieving revision 1.15
diff -u -p -r1.15 gpio_keys.c
--- drivers/input/keyboard/gpio_keys.c 25 Feb 2007 15:26:10 -0000 1.15
+++ drivers/input/keyboard/gpio_keys.c 13 Apr 2007 21:07:03 -0000
@@ -39,7 +39,10 @@ static irqreturn_t gpio_keys_isr(int irq
if (irq == gpio_to_irq(gpio)) {
int state = (gpio_get_value(gpio) ? 1 : 0) ^
(pdata->buttons[i].active_low);
- input_report_key(input, pdata->buttons[i].keycode,
state);
+ if (pdata->buttons[i].type == EV_SW)
+ input_report_switch(input,
pdata->buttons[i].keycode, state);
+ else
+ input_report_key(input,
pdata->buttons[i].keycode, state);
input_sync(input);
}
}
@@ -84,7 +87,12 @@ static int __devinit gpio_keys_probe(str
irq, error);
goto fail;
}
- set_bit(code, input->keybit);
+ if (pdata->buttons[i].type == EV_SW) {
+ input->evbit[0] |= BIT(EV_SW);
+ set_bit(code, input->swbit);
+ } else {
+ set_bit(code, input->keybit);
+ }
}
error = input_register_device(input);
Wednesday, April 11, 2007, 11:06:17 AM, you wrote:
> Hi Dmitry,
> Dmitry Torokhov wrote / napísal(a):
[]
--
Best regards,
Paul mailto:[EMAIL PROTECTED]
