On Tue, Mar 24, 2009 at 12:50:54AM +0000, Matthew Garrett wrote:
> Recent Sony SR-series machines have an additional set of buttons accessed
> via the 0x127 method rather than the 0x100 method. Add support for these.
>
> Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
> ---
>
> Mattia, I don't have access to an SR so have no idea what these keys do
> - pictures suggest they might be media control buttons? The mapping
> probably wants to be more sensible than I have here.
I asked the SR user I'm in touch with to give this a try, but the below
seems to be the same mapping he sent.
>
> drivers/platform/x86/sony-laptop.c | 65 +++++++++++++++++++++++++++++-------
> include/linux/sonypi.h | 4 ++
> 2 files changed, 57 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
> index 2d142d3..96f5fb5 100644
> --- a/drivers/platform/x86/sony-laptop.c
> +++ b/drivers/platform/x86/sony-laptop.c
> @@ -226,6 +226,10 @@ static int sony_laptop_input_index[] = {
> 49, /* 62 SONYPI_EVENT_ZOOM_IN_PRESSED */
> 50, /* 63 SONYPI_EVENT_ZOOM_OUT_PRESSED */
> 51, /* 64 SONYPI_EVENT_CD_EJECT_PRESSED */
> + 52, /* 65 SONYPI_EVENT_MODEKEY_PRESSED */
> + 53, /* SONYPI_EVENT_PKEY_P4 */
> + 54, /* SONYPI_EVENT_PKEY_P5 */
> + 55, /* SONYPI_EVENT_SETTINGKEY_PRESSED */
> };
>
> static int sony_laptop_input_keycode_map[] = {
> @@ -280,7 +284,11 @@ static int sony_laptop_input_keycode_map[] = {
> KEY_WLAN, /* 48 SONYPI_EVENT_WIRELESS_OFF */
> KEY_ZOOMIN, /* 49 SONYPI_EVENT_ZOOM_IN_PRESSED */
> KEY_ZOOMOUT, /* 50 SONYPI_EVENT_ZOOM_OUT_PRESSED */
> - KEY_EJECTCD /* 51 SONYPI_EVENT_CD_EJECT_PRESSED */
> + KEY_EJECTCD, /* 51 SONYPI_EVENT_CD_EJECT_PRESSED */
> + KEY_F13, /* 52 SONYPI_EVENT_MODEKEY_PRESSED */
> + KEY_PROG4, /* SONYPI_EVENT_PKEY_P4 */
> + KEY_F14, /* SONYPI_EVENT_PKEY_P5 */
> + KEY_F15, /* SONYPI_EVENT_SETTINGKEY_PRESSED */
> };
>
> /* release buttons after a short delay if pressed */
> @@ -850,7 +858,7 @@ struct sony_nc_event {
> u8 event;
> };
>
> -static struct sony_nc_event sony_nc_events[] = {
> +static struct sony_nc_event sony_100_events[] = {
> { 0x90, SONYPI_EVENT_PKEY_P1 },
> { 0x10, SONYPI_EVENT_ANYBUTTON_RELEASED },
> { 0x91, SONYPI_EVENT_PKEY_P1 },
> @@ -874,6 +882,25 @@ static struct sony_nc_event sony_nc_events[] = {
> { 0, 0 },
> };
>
> +static struct sony_nc_event sony_127_events[] = {
> + { 0x81, SONYPI_EVENT_MODEKEY_PRESSED },
> + { 0x01, SONYPI_EVENT_ANYBUTTON_RELEASED },
> + { 0x82, SONYPI_EVENT_PKEY_P1 },
> + { 0x02, SONYPI_EVENT_ANYBUTTON_RELEASED },
> + { 0x83, SONYPI_EVENT_PKEY_P2 },
> + { 0x03, SONYPI_EVENT_ANYBUTTON_RELEASED },
> + { 0x84, SONYPI_EVENT_PKEY_P3 },
> + { 0x04, SONYPI_EVENT_ANYBUTTON_RELEASED },
> + { 0x85, SONYPI_EVENT_PKEY_P4 },
> + { 0x05, SONYPI_EVENT_ANYBUTTON_RELEASED },
> + { 0x86, SONYPI_EVENT_PKEY_P5 },
> + { 0x06, SONYPI_EVENT_ANYBUTTON_RELEASED },
> + { 0x06, SONYPI_EVENT_ANYBUTTON_RELEASED },
...with a duplicate ;)
I'll take this out locally.
Other than that looks fine to me. I'll apply the whole series and push to
Len asap.
--
mattia
:wq!
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
