Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2be1dc21 authored by Ike Panhc's avatar Ike Panhc Committed by Matthew Garrett
Browse files

ideapad: define vpc commands 



Better then write hex number everywhere.

Signed-off-by: default avatarIke Panhc <ike.pan@canonical.com>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent 21893ab2

drivers/platform/x86/ideapad-laptop.c

+41 −16
Original line number Diff line number Diff line
@@ -42,6 +42,30 @@ 
#define CFG_WIFI_BIT	(18)

#define CFG_CAMERA_BIT	(19)



enum {

	VPCCMD_R_VPC1 = 0x10,

	VPCCMD_R_BL_MAX,

	VPCCMD_R_BL,

	VPCCMD_W_BL,

	VPCCMD_R_WIFI,

	VPCCMD_W_WIFI,

	VPCCMD_R_BT,

	VPCCMD_W_BT,

	VPCCMD_R_BL_POWER,

	VPCCMD_R_NOVO,

	VPCCMD_R_VPC2,

	VPCCMD_R_TOUCHPAD,

	VPCCMD_W_TOUCHPAD,

	VPCCMD_R_CAMERA,

	VPCCMD_W_CAMERA,

	VPCCMD_R_3G,

	VPCCMD_W_3G,

	VPCCMD_R_ODD, /* 0x21 */

	VPCCMD_R_RF = 0x23,

	VPCCMD_W_RF,

	VPCCMD_W_BL_POWER = 0x33,

};



struct ideapad_private {

	struct rfkill *rfk[IDEAPAD_RFKILL_DEV_NUM];

	struct platform_device *platform_device;
@@ -172,7 +196,7 @@ static ssize_t show_ideapad_cam(struct device *dev, 
{

	unsigned long result;



	if (read_ec_data(ideapad_handle, 0x1D, &result))

	if (read_ec_data(ideapad_handle, VPCCMD_R_CAMERA, &result))

		return sprintf(buf, "-1\n");

	return sprintf(buf, "%lu\n", result);

}
@@ -187,7 +211,7 @@ static ssize_t store_ideapad_cam(struct device *dev, 
		return 0;

	if (sscanf(buf, "%i", &state) != 1)

		return -EINVAL;

	ret = write_ec_cmd(ideapad_handle, 0x1E, state);

	ret = write_ec_cmd(ideapad_handle, VPCCMD_W_CAMERA, state);

	if (ret < 0)

		return ret;

	return count;
@@ -244,9 +268,9 @@ struct ideapad_rfk_data { 
};



const struct ideapad_rfk_data ideapad_rfk_data[] = {

	{ "ideapad_wlan",      CFG_WIFI_BIT, 0x15, RFKILL_TYPE_WLAN },

	{ "ideapad_bluetooth", CFG_BT_BIT,   0x17, RFKILL_TYPE_BLUETOOTH },

	{ "ideapad_3g",        CFG_3G_BIT,   0x20, RFKILL_TYPE_WWAN },

	{ "ideapad_wlan",    CFG_WIFI_BIT, VPCCMD_W_WIFI, RFKILL_TYPE_WLAN },

	{ "ideapad_bluetooth", CFG_BT_BIT, VPCCMD_W_BT, RFKILL_TYPE_BLUETOOTH },

	{ "ideapad_3g",        CFG_3G_BIT, VPCCMD_W_3G, RFKILL_TYPE_WWAN },

};



static int ideapad_rfk_set(void *data, bool blocked)
@@ -266,7 +290,7 @@ static void ideapad_sync_rfk_state(struct acpi_device *adevice) 
	unsigned long hw_blocked;

	int i;



	if (read_ec_data(ideapad_handle, 0x23, &hw_blocked))

	if (read_ec_data(ideapad_handle, VPCCMD_R_RF, &hw_blocked))

		return;

	hw_blocked = !hw_blocked;
@@ -426,16 +450,17 @@ static int ideapad_backlight_get_brightness(struct backlight_device *blightdev) 
{

	unsigned long now;



	if (read_ec_data(ideapad_handle, 0x12, &now))

	if (read_ec_data(ideapad_handle, VPCCMD_R_BL, &now))

		return -EIO;

	return now;

}



static int ideapad_backlight_update_status(struct backlight_device *blightdev)

{

	if (write_ec_cmd(ideapad_handle, 0x13, blightdev->props.brightness))

	if (write_ec_cmd(ideapad_handle, VPCCMD_W_BL,

			 blightdev->props.brightness))

		return -EIO;

	if (write_ec_cmd(ideapad_handle, 0x33,

	if (write_ec_cmd(ideapad_handle, VPCCMD_W_BL_POWER,

			 blightdev->props.power == FB_BLANK_POWERDOWN ? 0 : 1))

		return -EIO;
@@ -453,11 +478,11 @@ static int ideapad_backlight_init(struct ideapad_private *priv) 
	struct backlight_properties props;

	unsigned long max, now, power;



	if (read_ec_data(ideapad_handle, 0x11, &max))

	if (read_ec_data(ideapad_handle, VPCCMD_R_BL_MAX, &max))

		return -EIO;

	if (read_ec_data(ideapad_handle, 0x12, &now))

	if (read_ec_data(ideapad_handle, VPCCMD_R_BL, &now))

		return -EIO;

	if (read_ec_data(ideapad_handle, 0x18, &power))

	if (read_ec_data(ideapad_handle, VPCCMD_R_BL_POWER, &power))

		return -EIO;



	memset(&props, 0, sizeof(struct backlight_properties));
@@ -495,7 +520,7 @@ static void ideapad_backlight_notify_power(struct ideapad_private *priv) 


	if (!blightdev)

		return;

	if (read_ec_data(ideapad_handle, 0x18, &power))

	if (read_ec_data(ideapad_handle, VPCCMD_R_BL_POWER, &power))

		return;

	blightdev->props.power = power ? FB_BLANK_UNBLANK : FB_BLANK_POWERDOWN;

}
@@ -506,7 +531,7 @@ static void ideapad_backlight_notify_brightness(struct ideapad_private *priv) 


	/* if we control brightness via acpi video driver */

	if (priv->blightdev == NULL) {

		read_ec_data(ideapad_handle, 0x12, &now);

		read_ec_data(ideapad_handle, VPCCMD_R_BL, &now);

		return;

	}
@@ -595,9 +620,9 @@ static void ideapad_acpi_notify(struct acpi_device *adevice, u32 event) 
	acpi_handle handle = adevice->handle;

	unsigned long vpc1, vpc2, vpc_bit;



	if (read_ec_data(handle, 0x10, &vpc1))

	if (read_ec_data(handle, VPCCMD_R_VPC1, &vpc1))

		return;

	if (read_ec_data(handle, 0x1A, &vpc2))

	if (read_ec_data(handle, VPCCMD_R_VPC2, &vpc2))

		return;



	vpc1 = (vpc2 << 8) | vpc1;