redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

ideapad: use EC command to control camera

Browse source 
Signed-off-by: Ike Panhc <ike.pan@canonical.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Ike Panhc 2010-10-01 15:39:40 +08:00 committed by Matthew Garrett
parent dfa7f6fe0a
commit 26c81d5c9a
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/platform/x86/ideapad_acpi.c
View file

@ -35,6 +35,7 @@
#define IDEAPAD_DEV_KILLSW 4 #define IDEAPAD_DEV_KILLSW 4
struct ideapad_private { struct ideapad_private {
acpi_handle handle;
struct rfkill *rfk[5]; struct rfkill *rfk[5];
}; };
@ -207,24 +208,28 @@ static ssize_t show_ideapad_cam(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
int state = ideapad_dev_get_state(IDEAPAD_DEV_CAMERA); struct ideapad_private *priv = dev_get_drvdata(dev);
if (state < 0) acpi_handle handle = priv->handle;
return state; 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, static ssize_t store_ideapad_cam(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct ideapad_private *priv = dev_get_drvdata(dev);
acpi_handle handle = priv->handle;
int ret, state; int ret, state;
if (!count) if (!count)
return 0; return 0;
if (sscanf(buf, "%i", &state) != 1) if (sscanf(buf, "%i", &state) != 1)
return -EINVAL; return -EINVAL;
ret = ideapad_dev_set_state(IDEAPAD_DEV_CAMERA, !!state); ret = write_ec_cmd(handle, 0x1E, state);
if (ret < 0) if (ret < 0)
return ret; return ret;
return count; return count;
@ -330,6 +335,7 @@ static int ideapad_acpi_add(struct acpi_device *adevice)
} }
} }
priv->handle = adevice->handle;
dev_set_drvdata(&adevice->dev, priv); dev_set_drvdata(&adevice->dev, priv);
for (i = IDEAPAD_DEV_WLAN; i <= IDEAPAD_DEV_KILLSW; i++) { for (i = IDEAPAD_DEV_WLAN; i <= IDEAPAD_DEV_KILLSW; i++) {
if (!devs_present[i]) if (!devs_present[i])