* [PATCH] Input: Change from numbered to named switches
@ 2006-05-06 11:12 Richard Purdie
2006-05-30 4:13 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Richard Purdie @ 2006-05-06 11:12 UTC (permalink / raw)
To: dtor_core
Cc: linux-kernel, Pavel Machek, Matthew Garrett,
Benjamin Herrenschmidt, linux-input, Benjamin Berg, Johannes Berg
Remove the numbered SW_* entries from the input system and assign names
to the existing users.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Index: git/drivers/input/keyboard/corgikbd.c
===================================================================
--- git.orig/drivers/input/keyboard/corgikbd.c 2006-05-04 23:12:56.000000000 +0100
+++ git/drivers/input/keyboard/corgikbd.c 2006-05-05 16:21:45.000000000 +0100
@@ -245,9 +245,9 @@
if (hinge_count >= HINGE_STABLE_COUNT) {
spin_lock_irqsave(&corgikbd_data->lock, flags);
- input_report_switch(corgikbd_data->input, SW_0, ((sharpsl_hinge_state & CORGI_SCP_SWA) != 0));
- input_report_switch(corgikbd_data->input, SW_1, ((sharpsl_hinge_state & CORGI_SCP_SWB) != 0));
- input_report_switch(corgikbd_data->input, SW_2, (READ_GPIO_BIT(CORGI_GPIO_AK_INT) != 0));
+ input_report_switch(corgikbd_data->input, SW_LID, ((sharpsl_hinge_state & CORGI_SCP_SWA) != 0));
+ input_report_switch(corgikbd_data->input, SW_TABLET_MODE, ((sharpsl_hinge_state & CORGI_SCP_SWB) != 0));
+ input_report_switch(corgikbd_data->input, SW_HEADPHONE_INSERT, (READ_GPIO_BIT(CORGI_GPIO_AK_INT) != 0));
input_sync(corgikbd_data->input);
spin_unlock_irqrestore(&corgikbd_data->lock, flags);
@@ -340,9 +340,9 @@
for (i = 0; i < ARRAY_SIZE(corgikbd_keycode); i++)
set_bit(corgikbd->keycode[i], input_dev->keybit);
clear_bit(0, input_dev->keybit);
- set_bit(SW_0, input_dev->swbit);
- set_bit(SW_1, input_dev->swbit);
- set_bit(SW_2, input_dev->swbit);
+ set_bit(SW_LID, input_dev->swbit);
+ set_bit(SW_TABLET_MODE, input_dev->swbit);
+ set_bit(SW_HEADPHONE_INSERT, input_dev->swbit);
input_register_device(corgikbd->input);
Index: git/drivers/input/keyboard/spitzkbd.c
===================================================================
--- git.orig/drivers/input/keyboard/spitzkbd.c 2006-05-04 23:12:57.000000000 +0100
+++ git/drivers/input/keyboard/spitzkbd.c 2006-05-05 16:17:35.000000000 +0100
@@ -299,9 +299,9 @@
if (hinge_count >= HINGE_STABLE_COUNT) {
spin_lock_irqsave(&spitzkbd_data->lock, flags);
- input_report_switch(spitzkbd_data->input, SW_0, ((GPLR(SPITZ_GPIO_SWA) & GPIO_bit(SPITZ_GPIO_SWA)) != 0));
- input_report_switch(spitzkbd_data->input, SW_1, ((GPLR(SPITZ_GPIO_SWB) & GPIO_bit(SPITZ_GPIO_SWB)) != 0));
- input_report_switch(spitzkbd_data->input, SW_2, ((GPLR(SPITZ_GPIO_AK_INT) & GPIO_bit(SPITZ_GPIO_AK_INT)) != 0));
+ input_report_switch(spitzkbd_data->input, SW_LID, ((GPLR(SPITZ_GPIO_SWA) & GPIO_bit(SPITZ_GPIO_SWA)) != 0));
+ input_report_switch(spitzkbd_data->input, SW_TABLET_MODE, ((GPLR(SPITZ_GPIO_SWB) & GPIO_bit(SPITZ_GPIO_SWB)) != 0));
+ input_report_switch(spitzkbd_data->input, SW_HEADPHONE_INSERT, ((GPLR(SPITZ_GPIO_AK_INT) & GPIO_bit(SPITZ_GPIO_AK_INT)) != 0));
input_sync(spitzkbd_data->input);
spin_unlock_irqrestore(&spitzkbd_data->lock, flags);
@@ -398,9 +398,9 @@
for (i = 0; i < ARRAY_SIZE(spitzkbd_keycode); i++)
set_bit(spitzkbd->keycode[i], input_dev->keybit);
clear_bit(0, input_dev->keybit);
- set_bit(SW_0, input_dev->swbit);
- set_bit(SW_1, input_dev->swbit);
- set_bit(SW_2, input_dev->swbit);
+ set_bit(SW_LID, input_dev->swbit);
+ set_bit(SW_TABLET_MODE, input_dev->swbit);
+ set_bit(SW_HEADPHONE_INSERT, input_dev->swbit);
input_register_device(input_dev);
Index: git/include/linux/input.h
===================================================================
--- git.orig/include/linux/input.h 2006-05-04 23:13:11.000000000 +0100
+++ git/include/linux/input.h 2006-05-05 16:18:55.000000000 +0100
@@ -577,14 +577,9 @@
* Switch events
*/
-#define SW_0 0x00
-#define SW_1 0x01
-#define SW_2 0x02
-#define SW_3 0x03
-#define SW_4 0x04
-#define SW_5 0x05
-#define SW_6 0x06
-#define SW_7 0x07
+#define SW_LID 0x00 /* set = lid shut */
+#define SW_TABLET_MODE 0x01 /* set = tablet mode */
+#define SW_HEADPHONE_INSERT 0x02 /* set = inserted */
#define SW_MAX 0x0f
/*
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Input: Change from numbered to named switches
2006-05-06 11:12 [PATCH] Input: Change from numbered to named switches Richard Purdie
@ 2006-05-30 4:13 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2006-05-30 4:13 UTC (permalink / raw)
To: linux-input
Cc: Richard Purdie, linux-kernel, Pavel Machek, Matthew Garrett,
Benjamin Herrenschmidt, Benjamin Berg, Johannes Berg
On Saturday 06 May 2006 07:12, Richard Purdie wrote:
> Remove the numbered SW_* entries from the input system and assign names
> to the existing users.
>
Applied, thank you Richard.
--
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-05-30 4:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-05-06 11:12 [PATCH] Input: Change from numbered to named switches Richard Purdie
2006-05-30 4:13 ` Dmitry Torokhov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.