#include <acpi/acpi_bus.h>
#include <asm/uaccess.h>
-#define ASUS_ACPI_VERSION "0.28"
+#define ASUS_ACPI_VERSION "0.29"
#define PROC_ASUS "asus" //the directory
#define PROC_MLED "mled"
L3C, //L3800C
L3D, //L3400D
L3H, //L3H, but also L2000E
+ L4R, //L4500R
L5x, //L5800C
L8L, //L8400L
M1A, //M1300A
M2E, //M2400E, L4400L
+ M6N, //M6800N
+ M6R, //M6700R
P30, //Samsung P30
S1x, //S1300A, but also L1400B and M2400A (L84F)
S2x, //S200 (J1 reported), Victor MP-XP7210
- xxN, //M2400N, M3700N, M6800N, S1300N, S5200N (Centrino)
+ xxN, //M2400N, M3700N, M5200N, S1300N, S5200N, W1OOON
+ //(Centrino)
END_MODEL
} model; //Models currently supported
u16 event_count[128]; //count for each event TODO make this better
.display_get = "\\INFB"
},
+ {
+ .name = "L4R",
+ .mt_mled = "MLED",
+ .mt_wled = "WLED",
+ .wled_status = "\\_SB.PCI0.SBRG.SG13",
+ .mt_lcd_switch = xxN_PREFIX "_Q10",
+ .lcd_status = "\\_SB.PCI0.SBSM.SEO4",
+ .brightness_set = "SPLV",
+ .brightness_get = "GPLV",
+ .display_set = "SDSP",
+ .display_get = "\\_SB.PCI0.P0P1.VGA.GETD"
+ },
+
{
.name = "L5x",
.mt_mled = "MLED",
.display_get = "\\INFB"
},
+ {
+ .name = "M6N",
+ .mt_mled = "MLED",
+ .mt_wled = "WLED",
+ .wled_status = "\\_SB.PCI0.SBRG.SG13",
+ .mt_lcd_switch = xxN_PREFIX "_Q10",
+ .lcd_status = "\\_SB.BKLT",
+ .brightness_set = "SPLV",
+ .brightness_get = "GPLV",
+ .display_set = "SDSP",
+ .display_get = "\\SSTE"
+ },
+ {
+ .name = "M6R",
+ .mt_mled = "MLED",
+ .mt_wled = "WLED",
+ .mt_lcd_switch = xxN_PREFIX "_Q10",
+ .lcd_status = "\\_SB.PCI0.SBSM.SEO4",
+ .brightness_set = "SPLV",
+ .brightness_get = "GPLV",
+ .display_set = "SDSP",
+ .display_get = "\\SSTE"
+ },
+
+
{
.name = "P30",
.mt_wled = "WLED",
*/
static struct acpi_table_header *asus_info;
+/* The actual device the driver binds to */
+static struct asus_hotk *hotk;
+
/*
* The hotkey driver declaration
*/
{
int len = 0;
int temp;
- struct asus_hotk *hotk = (struct asus_hotk *) data;
char buf[16]; //enough for all info
/*
* We use the easy way, we don't care of off and count, so we don't set eof
len += sprintf(page + len, "SFUN value : 0x%04x\n", temp);
/*
* Another value for userspace: the ASYM method returns 0x02 for
- * battery low and 0x04 for battery critical, it's readings tend to be
+ * battery low and 0x04 for battery critical, its readings tend to be
* more accurate than those provided by _BST.
* Note: since not all the laptops provide this method, errors are
* silently ignored.
/* Generic LED functions */
static int
-read_led(struct asus_hotk *hotk, const char *ledname, int ledmask)
+read_led(const char *ledname, int ledmask)
{
if (ledname) {
int led_status;
/* FIXME: kill extraneous args so it can be called independently */
static int
-write_led(const char __user *buffer, unsigned long count, struct asus_hotk *hotk,
+write_led(const char __user *buffer, unsigned long count,
char *ledname, int ledmask, int invert)
{
int value;
proc_read_mled(char *page, char **start, off_t off, int count, int *eof,
void *data)
{
- struct asus_hotk *hotk = (struct asus_hotk *) data;
- return sprintf(page, "%d\n", read_led(hotk, hotk->methods->mled_status, MLED_ON));
+ return sprintf(page, "%d\n", read_led(hotk->methods->mled_status, MLED_ON));
}
proc_write_mled(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
- struct asus_hotk *hotk = (struct asus_hotk *) data;
- return write_led(buffer, count, hotk, hotk->methods->mt_mled, MLED_ON, 1);
+ return write_led(buffer, count, hotk->methods->mt_mled, MLED_ON, 1);
}
/*
proc_read_wled(char *page, char **start, off_t off, int count, int *eof,
void *data)
{
- struct asus_hotk *hotk = (struct asus_hotk *) data;
- return sprintf(page, "%d\n", read_led(hotk, hotk->methods->wled_status, WLED_ON));
+ return sprintf(page, "%d\n", read_led(hotk->methods->wled_status, WLED_ON));
}
static int
proc_write_wled(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
- struct asus_hotk *hotk = (struct asus_hotk *) data;
- return write_led(buffer, count, hotk, hotk->methods->mt_wled, WLED_ON, 0);
+ return write_led(buffer, count, hotk->methods->mt_wled, WLED_ON, 0);
}
/*
proc_read_tled(char *page, char **start, off_t off, int count, int *eof,
void *data)
{
- struct asus_hotk *hotk = (struct asus_hotk *) data;
- return sprintf(page, "%d\n", read_led(hotk, hotk->methods->tled_status, TLED_ON));
+ return sprintf(page, "%d\n", read_led(hotk->methods->tled_status, TLED_ON));
}
static int
proc_write_tled(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
- struct asus_hotk *hotk = (struct asus_hotk *) data;
- return write_led(buffer, count, hotk, hotk->methods->mt_tled, TLED_ON, 0);
+ return write_led(buffer, count, hotk->methods->mt_tled, TLED_ON, 0);
}
-
-static int get_lcd_state(struct asus_hotk *hotk)
+static int get_lcd_state(void)
{
int lcd = 0;
return (lcd & 1);
}
-static int set_lcd_state(struct asus_hotk *hotk, int value)
+static int set_lcd_state(int value)
{
int lcd = 0;
acpi_status status = 0;
lcd = value ? 1 : 0;
- if (lcd != get_lcd_state(hotk)) {
+ if (lcd != get_lcd_state()) {
/* switch */
if (hotk->model != L3H) {
status =
proc_read_lcd(char *page, char **start, off_t off, int count, int *eof,
void *data)
{
- return sprintf(page, "%d\n", get_lcd_state((struct asus_hotk *) data));
+ return sprintf(page, "%d\n", get_lcd_state());
}
unsigned long count, void *data)
{
int value;
- struct asus_hotk *hotk = (struct asus_hotk *) data;
count = parse_arg(buffer, count, &value);
if (count > 0)
- set_lcd_state(hotk, value);
+ set_lcd_state(value);
return count;
}
-static int read_brightness(struct asus_hotk *hotk)
+static int read_brightness(void)
{
int value;
/*
* Change the brightness level
*/
-static void set_brightness(int value, struct asus_hotk *hotk)
+static void set_brightness(int value)
{
acpi_status status = 0;
}
/* No SPLV method if we are here, act as appropriate */
- value -= read_brightness(hotk);
+ value -= read_brightness();
while (value != 0) {
status = acpi_evaluate_object(NULL, (value > 0) ?
hotk->methods->brightness_up :
proc_read_brn(char *page, char **start, off_t off, int count, int *eof,
void *data)
{
- struct asus_hotk *hotk = (struct asus_hotk *) data;
- return sprintf(page, "%d\n", read_brightness(hotk));
+ return sprintf(page, "%d\n", read_brightness());
}
static int
unsigned long count, void *data)
{
int value;
- struct asus_hotk *hotk = (struct asus_hotk *) data;
count = parse_arg(buffer, count, &value);
if (count > 0) {
value = (0 < value) ? ((15 < value) ? 15 : value) : 0;
/* 0 <= value <= 15 */
- set_brightness(value, hotk);
+ set_brightness(value);
} else if (count < 0) {
printk(KERN_WARNING "Asus ACPI: Error reading user input\n");
}
return count;
}
-static void set_display(int value, struct asus_hotk *hotk)
+static void set_display(int value)
{
/* no sanity check needed for now */
if (!write_acpi_int(hotk->handle, hotk->methods->display_set,
void *data)
{
int value = 0;
- struct asus_hotk *hotk = (struct asus_hotk *) data;
if (!read_acpi_int(hotk->handle, hotk->methods->display_get, &value))
printk(KERN_WARNING "Asus ACPI: Error reading display status\n");
+ value &= 0x07; /* needed for some models, shouldn't hurt others */
return sprintf(page, "%d\n", value);
}
unsigned long count, void *data)
{
int value;
- struct asus_hotk *hotk = (struct asus_hotk *) data;
count = parse_arg(buffer, count, &value);
if (count > 0)
- set_display(value, hotk);
+ set_display(value);
else if (count < 0)
printk(KERN_WARNING "Asus ACPI: Error reading user input\n");
static int __init asus_hotk_add_fs(struct acpi_device *device)
{
struct proc_dir_entry *proc;
- struct asus_hotk *hotk = acpi_driver_data(device);
mode_t mode;
/*
}
if ((hotk->methods->brightness_up && hotk->methods->brightness_down) ||
- (hotk->methods->brightness_get && hotk->methods->brightness_get)) {
+ (hotk->methods->brightness_get && hotk->methods->brightness_set)) {
asus_proc_add(PROC_BRN, &proc_write_brn, &proc_read_brn, mode, device);
}
if (hotk->methods->display_set) {
asus_proc_add(PROC_DISP, &proc_write_disp, &proc_read_disp, mode, device);
-
}
return 0;
static int asus_hotk_remove_fs(struct acpi_device* device)
{
- struct asus_hotk* hotk = acpi_driver_data(device);
-
-
- if(acpi_device_dir(device)){
+ if(acpi_device_dir(device)) {
remove_proc_entry(PROC_INFO,acpi_device_dir(device));
if (hotk->methods->mt_wled)
remove_proc_entry(PROC_WLED,acpi_device_dir(device));
remove_proc_entry(PROC_MLED,acpi_device_dir(device));
if (hotk->methods->mt_tled)
remove_proc_entry(PROC_TLED,acpi_device_dir(device));
- if (hotk->methods->mt_lcd_switch && hotk->methods->lcd_status)
+ if (hotk->methods->mt_lcd_switch && hotk->methods->lcd_status)
remove_proc_entry(PROC_LCD, acpi_device_dir(device));
- if ((hotk->methods->brightness_up && hotk->methods->brightness_down) || (hotk->methods->brightness_get && hotk->methods->brightness_get))
+ if ((hotk->methods->brightness_up && hotk->methods->brightness_down) ||
+ (hotk->methods->brightness_get && hotk->methods->brightness_set))
remove_proc_entry(PROC_BRN, acpi_device_dir(device));
- if (hotk->methods->display_set)
+ if (hotk->methods->display_set)
remove_proc_entry(PROC_DISP, acpi_device_dir(device));
}
return 0;
static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
{
- /* TODO Find a better way to handle events count. Here, in data, we receive
- * the hotk, so we can do anything!
- */
- struct asus_hotk *hotk = (struct asus_hotk *) data;
-
+ /* TODO Find a better way to handle events count.*/
if (!hotk)
return;
* This function is used to initialize the hotk with right values. In this
* method, we can make all the detection we want, and modify the hotk struct
*/
-static int __init asus_hotk_get_info(struct asus_hotk *hotk)
+static int __init asus_hotk_get_info(void)
{
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
struct acpi_buffer dsdt = { ACPI_ALLOCATE_BUFFER, NULL };
hotk->model = L3C;
else if (strncmp(model->string.pointer, "L8L", 3) == 0)
hotk->model = L8L;
+ else if (strncmp(model->string.pointer, "L4R", 3) == 0)
+ hotk->model = L4R;
+ else if (strncmp(model->string.pointer, "M6N", 3) == 0)
+ hotk->model = M6N;
+ else if (strncmp(model->string.pointer, "M6R", 3) == 0)
+ hotk->model = M6R;
else if (strncmp(model->string.pointer, "M2N", 3) == 0 ||
strncmp(model->string.pointer, "M3N", 3) == 0 ||
+ strncmp(model->string.pointer, "M5N", 3) == 0 ||
strncmp(model->string.pointer, "M6N", 3) == 0 ||
strncmp(model->string.pointer, "S1N", 3) == 0 ||
- strncmp(model->string.pointer, "S5N", 3) == 0)
+ strncmp(model->string.pointer, "S5N", 3) == 0 ||
+ strncmp(model->string.pointer, "W1N", 3) == 0)
hotk->model = xxN;
else if (strncmp(model->string.pointer, "M1", 2) == 0)
hotk->model = M1A;
hotk->model = L5x;
if (hotk->model == END_MODEL) {
- /* By default use the same values, as I don't know others */
printk("unsupported, trying default values, supply the "
"developers with your DSDT\n");
hotk->model = M2E;
hotk->methods->lcd_status = NULL;
/* L2B is similar enough to L3C to use its settings, with this only
exception */
- else if (strncmp(model->string.pointer, "S5N", 3) == 0)
+ else if (strncmp(model->string.pointer, "S5N", 3) == 0 ||
+ strncmp(model->string.pointer, "M5N", 3) == 0)
hotk->methods->mt_mled = NULL;
- /* S5N has no MLED */
- else if (strncmp(model->string.pointer, "M6N", 3) == 0) {
- hotk->methods->display_get = NULL; //TODO
- hotk->methods->lcd_status = "\\_SB.BKLT";
- hotk->methods->mt_wled = "WLED";
- hotk->methods->wled_status = "\\_SB.PCI0.SBRG.SG13";
- /* M6N differs slightly and has a usable WLED */
- }
+ /* S5N and M5N have no MLED */
+ else if (strncmp(model->string.pointer, "M2N", 3) == 0 ||
+ strncmp(model->string.pointer, "W1N", 3) == 0)
+ hotk->methods->mt_wled = "WLED";
+ /* M2N and W1N have a usable WLED */
else if (asus_info) {
if (strncmp(asus_info->oem_table_id, "L1", 2) == 0)
hotk->methods->mled_status = NULL;
}
-
-static int __init asus_hotk_check(struct asus_hotk *hotk)
+static int __init asus_hotk_check(void)
{
int result = 0;
- if (!hotk)
- return(-EINVAL);
-
result = acpi_bus_get_status(hotk->device);
if (result)
return(result);
if (hotk->device->status.present) {
- result = asus_hotk_get_info(hotk);
+ result = asus_hotk_get_info();
} else {
printk(KERN_ERR " Hotkey device not present, aborting\n");
return(-EINVAL);
}
-
static int __init asus_hotk_add(struct acpi_device *device)
{
- struct asus_hotk *hotk = NULL;
acpi_status status = AE_OK;
int result;
hotk->device = device;
- result = asus_hotk_check(hotk);
+ result = asus_hotk_check();
if (result)
goto end;
return(result);
}
+
static int asus_hotk_remove(struct acpi_device *device, int type)
{
acpi_status status = 0;
- struct asus_hotk *hotk = NULL;
if (!device || !acpi_driver_data(device))
return(-EINVAL);
- hotk = (struct asus_hotk *) acpi_driver_data(device);
-
status = acpi_remove_notify_handler(hotk->handle, ACPI_SYSTEM_NOTIFY,
asus_hotk_notify);
if (ACPI_FAILURE(status))
{
int result;
+ if (acpi_disabled)
+ return -ENODEV;
+
asus_proc_dir = proc_mkdir(PROC_ASUS, acpi_root_dir);
if (!asus_proc_dir) {
printk(KERN_ERR "Asus ACPI: Unable to create /proc entry\n");
- return(-ENODEV);
+ return -ENODEV;
}
asus_proc_dir->owner = THIS_MODULE;
result = acpi_bus_register_driver(&asus_hotk_driver);
- if (result < 0) {
+ if (result < 1) {
+ acpi_bus_unregister_driver(&asus_hotk_driver);
remove_proc_entry(PROC_ASUS, acpi_root_dir);
- return(-ENODEV);
+ return -ENODEV;
}
- return(0);
+ return 0;
}
git://git.onelab.eu / linux-2.6.git / blobdiff