ideapad: use EC command to control camera
[linux-2.6.git] / drivers / platform / x86 / ideapad_acpi.c
index e07d607..e45fc50 100644 (file)
 #define IDEAPAD_DEV_KILLSW     4
 
 struct ideapad_private {
+       acpi_handle handle;
        struct rfkill *rfk[5];
 };
 
 static struct {
        char *name;
+       int cfgbit;
        int type;
 } ideapad_rfk_data[] = {
-       /* camera has no rfkill */
-       { "ideapad_wlan",       RFKILL_TYPE_WLAN },
-       { "ideapad_bluetooth",  RFKILL_TYPE_BLUETOOTH },
-       { "ideapad_3g",         RFKILL_TYPE_WWAN },
-       { "ideapad_killsw",     RFKILL_TYPE_WLAN }
+       { "ideapad_camera",     19, NUM_RFKILL_TYPES },
+       { "ideapad_wlan",       18, RFKILL_TYPE_WLAN },
+       { "ideapad_bluetooth",  16, RFKILL_TYPE_BLUETOOTH },
+       { "ideapad_3g",         17, RFKILL_TYPE_WWAN },
+       { "ideapad_killsw",     0, RFKILL_TYPE_WLAN }
 };
 
 /*
@@ -158,32 +160,6 @@ static int write_ec_cmd(acpi_handle handle, int cmd, unsigned long data)
 }
 /* the above is ACPI helpers */
 
-static int ideapad_dev_exists(int device)
-{
-       acpi_status status;
-       union acpi_object in_param;
-       struct acpi_object_list input = { 1, &in_param };
-       struct acpi_buffer output;
-       union acpi_object out_obj;
-
-       output.length = sizeof(out_obj);
-       output.pointer = &out_obj;
-
-       in_param.type = ACPI_TYPE_INTEGER;
-       in_param.integer.value = device + 1;
-
-       status = acpi_evaluate_object(NULL, "\\_SB_.DECN", &input, &output);
-       if (ACPI_FAILURE(status)) {
-               printk(KERN_WARNING "IdeaPAD \\_SB_.DECN method failed %d. Is this an IdeaPAD?\n", status);
-               return -ENODEV;
-       }
-       if (out_obj.type != ACPI_TYPE_INTEGER) {
-               printk(KERN_WARNING "IdeaPAD \\_SB_.DECN method returned unexpected type\n");
-               return -ENODEV;
-       }
-       return out_obj.integer.value;
-}
-
 static int ideapad_dev_get_state(int device)
 {
        acpi_status status;
@@ -232,24 +208,28 @@ static ssize_t show_ideapad_cam(struct device *dev,
                                struct device_attribute *attr,
                                char *buf)
 {
-       int state = ideapad_dev_get_state(IDEAPAD_DEV_CAMERA);
-       if (state < 0)
-               return state;
+       struct ideapad_private *priv = dev_get_drvdata(dev);
+       acpi_handle handle = priv->handle;
+       unsigned long result;
 
-       return sprintf(buf, "%d\n", state);
+       if (read_ec_data(handle, 0x1D, &result))
+               return sprintf(buf, "-1\n");
+       return sprintf(buf, "%lu\n", result);
 }
 
 static ssize_t store_ideapad_cam(struct device *dev,
                                 struct device_attribute *attr,
                                 const char *buf, size_t count)
 {
+       struct ideapad_private *priv = dev_get_drvdata(dev);
+       acpi_handle handle = priv->handle;
        int ret, state;
 
        if (!count)
                return 0;
        if (sscanf(buf, "%i", &state) != 1)
                return -EINVAL;
-       ret = ideapad_dev_set_state(IDEAPAD_DEV_CAMERA, !!state);
+       ret = write_ec_cmd(handle, 0x1E, state);
        if (ret < 0)
                return ret;
        return count;
@@ -326,14 +306,18 @@ MODULE_DEVICE_TABLE(acpi, ideapad_device_ids);
 
 static int ideapad_acpi_add(struct acpi_device *adevice)
 {
-       int i;
+       int i, cfg;
        int devs_present[5];
        struct ideapad_private *priv;
 
+       if (read_method_int(adevice->handle, "_CFG", &cfg))
+               return -ENODEV;
+
        for (i = IDEAPAD_DEV_CAMERA; i < IDEAPAD_DEV_KILLSW; i++) {
-               devs_present[i] = ideapad_dev_exists(i);
-               if (devs_present[i] < 0)
-                       return devs_present[i];
+               if (test_bit(ideapad_rfk_data[i].cfgbit, (unsigned long *)&cfg))
+                       devs_present[i] = 1;
+               else
+                       devs_present[i] = 0;
        }
 
        /* The hardware switch is always present */
@@ -351,6 +335,7 @@ static int ideapad_acpi_add(struct acpi_device *adevice)
                }
        }
 
+       priv->handle = adevice->handle;
        dev_set_drvdata(&adevice->dev, priv);
        for (i = IDEAPAD_DEV_WLAN; i <= IDEAPAD_DEV_KILLSW; i++) {
                if (!devs_present[i])