acer-wmi: replaced the hard coded bitmap by the communication devices bitmap from SMBIOS

Before set communication devices state, we need query out all devices state to set
the states bitmap. That will be better use the devices bitmap in SMBIOS type Aah
instead of hardcode in driver.

Tested on Acer Travelmate 8572.

Cc: Carlos Corbacho <carlos@strangeworlds.co.uk>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: Corentin Chary <corentincj@iksaif.net>
Cc: Thomas Renninger <trenn@suse.de>
Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Lee, Chun-Yi 2011-10-06 19:06:13 +08:00 коммит произвёл Matthew Garrett
Родитель 1fbc01a7b0
Коммит 1d1fc8a75f
1 изменённых файлов: 3 добавлений и 4 удалений

Просмотреть файл

@ -206,6 +206,7 @@ static int threeg = -1;
static int force_series; static int force_series;
static bool ec_raw_mode; static bool ec_raw_mode;
static bool has_type_aa; static bool has_type_aa;
static u16 commun_func_bitmap;
module_param(mailled, int, 0444); module_param(mailled, int, 0444);
module_param(brightness, int, 0444); module_param(brightness, int, 0444);
@ -955,10 +956,7 @@ static acpi_status wmid3_set_device_status(u32 value, u16 device)
struct wmid3_gds_input_param params = { struct wmid3_gds_input_param params = {
.function_num = 0x1, .function_num = 0x1,
.hotkey_number = 0x01, .hotkey_number = 0x01,
.devices = ACER_WMID3_GDS_WIRELESS | .devices = commun_func_bitmap,
ACER_WMID3_GDS_THREEG |
ACER_WMID3_GDS_WIMAX |
ACER_WMID3_GDS_BLUETOOTH,
}; };
struct acpi_buffer input = { struct acpi_buffer input = {
sizeof(struct wmid3_gds_input_param), sizeof(struct wmid3_gds_input_param),
@ -1062,6 +1060,7 @@ static void type_aa_dmi_decode(const struct dmi_header *header, void *dummy)
pr_info("Function bitmap for Communication Button: 0x%x\n", pr_info("Function bitmap for Communication Button: 0x%x\n",
type_aa->commun_func_bitmap); type_aa->commun_func_bitmap);
commun_func_bitmap = type_aa->commun_func_bitmap;
if (type_aa->commun_func_bitmap & ACER_WMID3_GDS_WIRELESS) if (type_aa->commun_func_bitmap & ACER_WMID3_GDS_WIRELESS)
interface->capability |= ACER_CAP_WIRELESS; interface->capability |= ACER_CAP_WIRELESS;