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

Commit 9b57896e authored by Matthew Garrett's avatar Matthew Garrett Committed by Len Brown
Browse files

sony-laptop: Add support for extra keyboard events 



The current sony-laptop code assumes that the keyboard event method is
always located at slot 2 in the platform code. Remove this assumption and
add support for some additional hotkeys.

Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
Signed-off-by: default avatarMattia Dongili <malattia@linux.it>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 82734bfc

drivers/platform/x86/sony-laptop.c

+32 −27
Original line number Original line Diff line number Diff line
@@ -211,6 +211,7 @@ static int sony_laptop_input_index[] = { 
	48,	/* 61 SONYPI_EVENT_WIRELESS_OFF */

	48,	/* 61 SONYPI_EVENT_WIRELESS_OFF */

	49,	/* 62 SONYPI_EVENT_ZOOM_IN_PRESSED */

	49,	/* 62 SONYPI_EVENT_ZOOM_IN_PRESSED */

	50,	/* 63 SONYPI_EVENT_ZOOM_OUT_PRESSED */

	50,	/* 63 SONYPI_EVENT_ZOOM_OUT_PRESSED */

	51,	/* 64 SONYPI_EVENT_CD_EJECT_PRESSED */

};

};





static int sony_laptop_input_keycode_map[] = {

static int sony_laptop_input_keycode_map[] = {
@@ -264,7 +265,8 @@ static int sony_laptop_input_keycode_map[] = { 
	KEY_WLAN,	/* 47 SONYPI_EVENT_WIRELESS_ON */

	KEY_WLAN,	/* 47 SONYPI_EVENT_WIRELESS_ON */

	KEY_WLAN,	/* 48 SONYPI_EVENT_WIRELESS_OFF */

	KEY_WLAN,	/* 48 SONYPI_EVENT_WIRELESS_OFF */

	KEY_ZOOMIN,	/* 49 SONYPI_EVENT_ZOOM_IN_PRESSED */

	KEY_ZOOMIN,	/* 49 SONYPI_EVENT_ZOOM_IN_PRESSED */

	KEY_ZOOMOUT	/* 50 SONYPI_EVENT_ZOOM_OUT_PRESSED */

	KEY_ZOOMOUT,	/* 50 SONYPI_EVENT_ZOOM_OUT_PRESSED */

	KEY_EJECTCD	/* 51 SONYPI_EVENT_CD_EJECT_PRESSED */

};

};





/* release buttons after a short delay if pressed */

/* release buttons after a short delay if pressed */
@@ -834,7 +836,11 @@ struct sony_nc_event { 
	u8	event;

	u8	event;

};

};





static struct sony_nc_event sony_C_events[] = {

static struct sony_nc_event sony_nc_events[] = {

	{ 0x90, SONYPI_EVENT_PKEY_P1 },

	{ 0x10, SONYPI_EVENT_ANYBUTTON_RELEASED },

	{ 0x91, SONYPI_EVENT_PKEY_P1 },

	{ 0x11, SONYPI_EVENT_ANYBUTTON_RELEASED },

	{ 0x81, SONYPI_EVENT_FNKEY_F1 },

	{ 0x81, SONYPI_EVENT_FNKEY_F1 },

	{ 0x01, SONYPI_EVENT_FNKEY_RELEASED },

	{ 0x01, SONYPI_EVENT_FNKEY_RELEASED },

	{ 0x85, SONYPI_EVENT_FNKEY_F5 },

	{ 0x85, SONYPI_EVENT_FNKEY_F5 },
@@ -843,10 +849,14 @@ static struct sony_nc_event sony_C_events[] = { 
	{ 0x06, SONYPI_EVENT_FNKEY_RELEASED },

	{ 0x06, SONYPI_EVENT_FNKEY_RELEASED },

	{ 0x87, SONYPI_EVENT_FNKEY_F7 },

	{ 0x87, SONYPI_EVENT_FNKEY_F7 },

	{ 0x07, SONYPI_EVENT_FNKEY_RELEASED },

	{ 0x07, SONYPI_EVENT_FNKEY_RELEASED },

	{ 0x89, SONYPI_EVENT_FNKEY_F9 },

	{ 0x09, SONYPI_EVENT_FNKEY_RELEASED },

	{ 0x8A, SONYPI_EVENT_FNKEY_F10 },

	{ 0x8A, SONYPI_EVENT_FNKEY_F10 },

	{ 0x0A, SONYPI_EVENT_FNKEY_RELEASED },

	{ 0x0A, SONYPI_EVENT_FNKEY_RELEASED },

	{ 0x8C, SONYPI_EVENT_FNKEY_F12 },

	{ 0x8C, SONYPI_EVENT_FNKEY_F12 },

	{ 0x0C, SONYPI_EVENT_FNKEY_RELEASED },

	{ 0x0C, SONYPI_EVENT_FNKEY_RELEASED },

	{ 0x9f, SONYPI_EVENT_CD_EJECT_PRESSED },

	{ 0x1f, SONYPI_EVENT_ANYBUTTON_RELEASED },

	{ 0, 0 },

	{ 0, 0 },

};

};
@@ -855,38 +865,33 @@ static struct sony_nc_event sony_C_events[] = { 
 */

 */

static void sony_acpi_notify(acpi_handle handle, u32 event, void *data)

static void sony_acpi_notify(acpi_handle handle, u32 event, void *data)

{

{

	int i;

	u32 ev = event;

	u32 ev = event;

	int result;

	int result;





	if (ev == 0x92 || ev == 0x90) {

	if (ev >= 0x90) {

		/* New-style event */

		int origev = ev;

		int origev = ev;

		/* read the key pressed from EC.GECR

		ev -= 0x90;

		 * A call to SN07 with 0x0202 will do it as well respecting



		 * the current protocol on different OSes

		if (sony_find_snc_handle(0x100) == ev) {

		 *

			int i;

		 * Note: the path for GECR may be



		 *   \_SB.PCI0.LPCB.EC (C, FE, AR, N and friends)

		 *   \_SB.PCI0.PIB.EC0 (VGN-FR notifications are sent directly, no GECR)

		 *

		 * TODO: we may want to do the same for the older GHKE -need

		 *       dmi list- so this snippet may become one more callback.

		 */

			if (sony_call_snc_handle(0x100, 0x200, &result))

			if (sony_call_snc_handle(0x100, 0x200, &result))

				dprintk("sony_acpi_notify, unable to decode event 0x%.2x\n", ev);

				dprintk("sony_acpi_notify, unable to decode event 0x%.2x\n", ev);

			else

			else

				ev = result & 0xFF;

				ev = result & 0xFF;





		for (i = 0; sony_C_events[i].data; i++) {

			for (i = 0; sony_nc_events[i].event; i++) {

			if (sony_C_events[i].data == ev) {

				if (sony_nc_events[i].data == ev) {

				ev = sony_C_events[i].event;

					ev = sony_nc_events[i].event;

					break;

					break;

				}

				}

			}

			}





		if (!sony_C_events[i].data)

			if (!sony_nc_events[i].data)

			printk(KERN_INFO DRV_PFX "Unknown event: %x %x\n",

				printk(KERN_INFO DRV_PFX

			       origev, ev);

				       "Unknown event: %x %x\n", origev, ev);

		}

	}

	}





	dprintk("sony_acpi_notify, event: 0x%.2x\n", ev);

	dprintk("sony_acpi_notify, event: 0x%.2x\n", ev);

include/linux/sonypi.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -103,6 +103,7 @@ 
#define SONYPI_EVENT_WIRELESS_OFF		61

#define SONYPI_EVENT_WIRELESS_OFF		61

#define SONYPI_EVENT_ZOOM_IN_PRESSED		62

#define SONYPI_EVENT_ZOOM_IN_PRESSED		62

#define SONYPI_EVENT_ZOOM_OUT_PRESSED		63

#define SONYPI_EVENT_ZOOM_OUT_PRESSED		63

#define SONYPI_EVENT_CD_EJECT_PRESSED		64





/* get/set brightness */

/* get/set brightness */

#define SONYPI_IOCGBRT		_IOR('v', 0, __u8)

#define SONYPI_IOCGBRT		_IOR('v', 0, __u8)