Commit 4564de17 authored by Corentin Chary's avatar Corentin Chary Committed by Len Brown

asus-laptop: add bluetooth and wlan support

WLED and BLED are not handled like other leds (MLED, etc ..),
because sometime they also control the wlan/bluetooth device.
If the method for wireless_status is found, it's used to get the
status, otherwise hotk->status is used.  We also use the HWRS
method, which tell if the bluetooth/wlan device is present or not.
This patch show why we need a ASUS_SET_DEVICE_ATTR macro : if
there is a bluetooth device, /sys/dev.../asus-laptop/bluetooth
is usable, else it's not but it's clean.
Signed-off-by: default avatarCorentin Chary <corentincj@iksaif.net>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent be18cdab
......@@ -55,9 +55,18 @@
#define ASUS_HOTK_FILE "asus-laptop"
#define ASUS_HOTK_PREFIX "\\_SB.ATKD."
/*
* Known bits returned by \_SB.ATKD.HWRS
*/
#define WL_HWRS 0x80
#define BT_HWRS 0x100
/*
* Flags for hotk status
* WL_ON and BT_ON are also used for wireless_status()
*/
#define WL_ON 0x01 //internal Wifi
#define BT_ON 0x02 //internal Bluetooth
#define MLED_ON 0x04 //mail LED
#define TLED_ON 0x08 //touchpad LED
#define RLED_ON 0x10 //Record LED
......@@ -84,6 +93,14 @@ ASUS_HANDLE(tled_set, ASUS_HOTK_PREFIX "TLED");
ASUS_HANDLE(rled_set, ASUS_HOTK_PREFIX "RLED"); /* W1JC */
ASUS_HANDLE(pled_set, ASUS_HOTK_PREFIX "PLED"); /* A7J */
/* Bluetooth and WLAN
* WLED and BLED are not handled like other XLED, because in some dsdt
* they also control the WLAN/Bluetooth device.
*/
ASUS_HANDLE(wl_switch, ASUS_HOTK_PREFIX "WLED");
ASUS_HANDLE(bt_switch, ASUS_HOTK_PREFIX "BLED");
ASUS_HANDLE(wireless_status, ASUS_HOTK_PREFIX "RSTS"); /* All new models */
/*
* This is the main structure, we can use it to store anything interesting
* about the hotk device
......@@ -181,14 +198,32 @@ static int read_acpi_int(acpi_handle handle, const char *method, int *val,
return (status == AE_OK) && (out_obj.type == ACPI_TYPE_INTEGER);
}
static int read_wireless_status(int mask) {
int status;
if (!wireless_status_handle)
return (hotk->status & mask) ? 1 : 0;
if (read_acpi_int(wireless_status_handle, NULL, &status, NULL)) {
return (status & mask) ? 1 : 0;
} else
printk(ASUS_WARNING "Error reading Wireless status\n");
return (hotk->status & mask) ? 1 : 0;
}
/* Generic LED functions */
static int read_status(int mask)
{
/* There is a special method for both wireless devices */
if (mask == BT_ON || mask == WL_ON)
return read_wireless_status(mask);
return (hotk->status & mask) ? 1 : 0;
}
static void write_status(acpi_handle handle, int out, int mask,
int invert)
int invert)
{
hotk->status = (out) ? (hotk->status | mask) : (hotk->status & ~mask);
......@@ -292,6 +327,51 @@ static int parse_arg(const char *buf, unsigned long count, int *val)
return count;
}
static ssize_t store_status(const char *buf, size_t count,
acpi_handle handle, int mask, int invert)
{
int rv, value;
int out = 0;
rv = parse_arg(buf, count, &value);
if (rv > 0)
out = value ? 1 : 0;
write_status(handle, out, mask, invert);
return rv;
}
/*
* WLAN
*/
static ssize_t show_wlan(struct device *dev,
struct device_attribute *attr, char *buf)
{
return sprintf(buf, "%d\n", read_status(WL_ON));
}
static ssize_t store_wlan(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
return store_status(buf, count, wl_switch_handle, WL_ON, 0);
}
/*
* Bluetooth
*/
static ssize_t show_bluetooth(struct device *dev,
struct device_attribute *attr, char *buf)
{
return sprintf(buf, "%d\n", read_status(BT_ON));
}
static ssize_t store_bluetooth(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
return store_status(buf, count, bt_switch_handle, BT_ON, 0);
}
static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
{
/* TODO Find a better way to handle events count. */
......@@ -322,9 +402,13 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
} while(0)
static ASUS_CREATE_DEVICE_ATTR(infos);
static ASUS_CREATE_DEVICE_ATTR(wlan);
static ASUS_CREATE_DEVICE_ATTR(bluetooth);
static struct attribute *asuspf_attributes[] = {
&dev_attr_infos.attr,
&dev_attr_wlan.attr,
&dev_attr_bluetooth.attr,
NULL
};
......@@ -345,6 +429,13 @@ static struct platform_device *asuspf_device;
static void asus_hotk_add_fs(void)
{
ASUS_SET_DEVICE_ATTR(infos, 0444, show_infos, NULL);
if (wl_switch_handle)
ASUS_SET_DEVICE_ATTR(wlan, 0644, show_wlan, store_wlan);
if (bt_switch_handle)
ASUS_SET_DEVICE_ATTR(bluetooth, 0644,
show_bluetooth, store_bluetooth);
}
static int asus_handle_init(char *name, acpi_handle *handle,
......@@ -377,7 +468,7 @@ static int asus_hotk_get_info(void)
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
struct acpi_buffer dsdt = { ACPI_ALLOCATE_BUFFER, NULL };
union acpi_object *model = NULL;
int bsts_result;
int bsts_result, hwrs_result;
char *string = NULL;
acpi_status status;
......@@ -440,6 +531,22 @@ static int asus_hotk_get_info(void)
ASUS_HANDLE_INIT(rled_set);
ASUS_HANDLE_INIT(pled_set);
/*
* The HWRS method return informations about the hardware.
* 0x80 bit is for WLAN, 0x100 for Bluetooth.
* The significance of others is yet to be found.
* If we don't find the method, we assume the device are present.
*/
if (!read_acpi_int(hotk->handle, "HRWS", &hwrs_result, NULL))
hwrs_result = WL_HWRS | BT_HWRS;
if(hwrs_result & WL_HWRS)
ASUS_HANDLE_INIT(wl_switch);
if(hwrs_result & BT_HWRS)
ASUS_HANDLE_INIT(bt_switch);
ASUS_HANDLE_INIT(wireless_status);
kfree(model);
return AE_OK;
......@@ -504,6 +611,10 @@ static int asus_hotk_add(struct acpi_device *device)
asus_hotk_found = 1;
/* WLED and BLED are on by default */
write_status(bt_switch_handle, 1, BT_ON, 0);
write_status(wl_switch_handle, 1, WL_ON, 0);
end:
if (result) {
kfree(hotk->name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment