aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin Chary <corentincj@iksaif.net>2011-02-06 07:28:43 -0500
committerMatthew Garrett <mjg@redhat.com>2011-03-28 06:05:20 -0400
commit43815941efb1374c2f71eb1fb0a2814b049030eb (patch)
tree531f72769f3bf94bfeb1cfb82cb48df8b3fdd819
parent4615bb661352acb7032796185c8c5573e47dfa1d (diff)
eeepc-wmi: reorder device ids
Each device seems to be in a "group" (devid >> 16 & 0xFF). Signed-off-by: Corentin Chary <corentincj@iksaif.net> Signed-off-by: Matthew Garrett <mjg@redhat.com>
-rw-r--r--drivers/platform/x86/eeepc-wmi.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
index 16c7f2d62515..eea8c942653b 100644
--- a/drivers/platform/x86/eeepc-wmi.c
+++ b/drivers/platform/x86/eeepc-wmi.c
@@ -65,21 +65,32 @@ MODULE_ALIAS("wmi:"EEEPC_WMI_MGMT_GUID);
65#define NOTIFY_BRNDOWN_MIN 0x20 65#define NOTIFY_BRNDOWN_MIN 0x20
66#define NOTIFY_BRNDOWN_MAX 0x2e 66#define NOTIFY_BRNDOWN_MAX 0x2e
67 67
68/* WMI Methods */
68#define EEEPC_WMI_METHODID_DSTS 0x53544344 69#define EEEPC_WMI_METHODID_DSTS 0x53544344
69#define EEEPC_WMI_METHODID_DEVS 0x53564544 70#define EEEPC_WMI_METHODID_DEVS 0x53564544
70#define EEEPC_WMI_METHODID_CFVS 0x53564643 71#define EEEPC_WMI_METHODID_CFVS 0x53564643
71 72
73/* Wireless */
72#define EEEPC_WMI_DEVID_WLAN 0x00010011 74#define EEEPC_WMI_DEVID_WLAN 0x00010011
73#define EEEPC_WMI_DEVID_BLUETOOTH 0x00010013 75#define EEEPC_WMI_DEVID_BLUETOOTH 0x00010013
74#define EEEPC_WMI_DEVID_WIMAX 0x00010017 76#define EEEPC_WMI_DEVID_WIMAX 0x00010017
75#define EEEPC_WMI_DEVID_WWAN3G 0x00010019 77#define EEEPC_WMI_DEVID_WWAN3G 0x00010019
78
79/* Backlight and Brightness */
76#define EEEPC_WMI_DEVID_BACKLIGHT 0x00050011 80#define EEEPC_WMI_DEVID_BACKLIGHT 0x00050011
77#define EEEPC_WMI_DEVID_BRIGHTNESS 0x00050012 81#define EEEPC_WMI_DEVID_BRIGHTNESS 0x00050012
82
83/* Misc */
78#define EEEPC_WMI_DEVID_CAMERA 0x00060013 84#define EEEPC_WMI_DEVID_CAMERA 0x00060013
85
86/* Storage */
79#define EEEPC_WMI_DEVID_CARDREADER 0x00080013 87#define EEEPC_WMI_DEVID_CARDREADER 0x00080013
88
89/* Input */
80#define EEEPC_WMI_DEVID_TOUCHPAD 0x00100011 90#define EEEPC_WMI_DEVID_TOUCHPAD 0x00100011
81#define EEEPC_WMI_DEVID_TOUCHPAD_LED 0x00100012 91#define EEEPC_WMI_DEVID_TOUCHPAD_LED 0x00100012
82 92
93/* DSTS masks */
83#define EEEPC_WMI_DSTS_STATUS_BIT 0x00000001 94#define EEEPC_WMI_DSTS_STATUS_BIT 0x00000001
84#define EEEPC_WMI_DSTS_PRESENCE_BIT 0x00010000 95#define EEEPC_WMI_DSTS_PRESENCE_BIT 0x00010000
85#define EEEPC_WMI_DSTS_BRIGHTNESS_MASK 0x000000FF 96#define EEEPC_WMI_DSTS_BRIGHTNESS_MASK 0x000000FF