Merge tag 'v4.0-rc5' into next
Merge with the latest upstream to synchronize Synaptics changes and bring in new infrastructure pieces. Conflicts: drivers/input/mouse/synaptics.c
This commit is contained in:
Dmitry Torokhov
@@ -2605,8 +2605,10 @@ int alps_detect(struct psmouse *psmouse, bool set_properties)
|
||||
return -ENOMEM;
|
||||
|
||||
error = alps_identify(psmouse, priv);
|
||||
if (error)
|
||||
if (error) {
|
||||
kfree(priv);
|
||||
return error;
|
||||
}
|
||||
|
||||
if (set_properties) {
|
||||
psmouse->vendor = "ALPS";
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <linux/input/mt.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/unaligned/access_ok.h>
|
||||
#include <asm/unaligned.h>
|
||||
#include "cyapa.h"
|
||||
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/completion.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/unaligned/access_ok.h>
|
||||
#include <asm/unaligned.h>
|
||||
#include <linux/crc-itu-t.h>
|
||||
#include "cyapa.h"
|
||||
|
||||
@@ -1926,7 +1926,7 @@ static int cyapa_gen5_read_idac_data(struct cyapa *cyapa,
|
||||
electrodes_tx = cyapa->electrodes_x;
|
||||
max_element_cnt = ((cyapa->aligned_electrodes_rx + 7) &
|
||||
~7u) * electrodes_tx;
|
||||
} else if (idac_data_type == GEN5_RETRIEVE_SELF_CAP_PWC_DATA) {
|
||||
} else {
|
||||
offset = 2;
|
||||
max_element_cnt = cyapa->electrodes_x +
|
||||
cyapa->electrodes_y;
|
||||
|
||||
@@ -67,9 +67,6 @@ static void focaltech_reset(struct psmouse *psmouse)
|
||||
|
||||
#define FOC_MAX_FINGERS 5
|
||||
|
||||
#define FOC_MAX_X 2431
|
||||
#define FOC_MAX_Y 1663
|
||||
|
||||
/*
|
||||
* Current state of a single finger on the touchpad.
|
||||
*/
|
||||
@@ -129,9 +126,17 @@ static void focaltech_report_state(struct psmouse *psmouse)
|
||||
input_mt_slot(dev, i);
|
||||
input_mt_report_slot_state(dev, MT_TOOL_FINGER, active);
|
||||
if (active) {
|
||||
input_report_abs(dev, ABS_MT_POSITION_X, finger->x);
|
||||
unsigned int clamped_x, clamped_y;
|
||||
/*
|
||||
* The touchpad might report invalid data, so we clamp
|
||||
* the resulting values so that we do not confuse
|
||||
* userspace.
|
||||
*/
|
||||
clamped_x = clamp(finger->x, 0U, priv->x_max);
|
||||
clamped_y = clamp(finger->y, 0U, priv->y_max);
|
||||
input_report_abs(dev, ABS_MT_POSITION_X, clamped_x);
|
||||
input_report_abs(dev, ABS_MT_POSITION_Y,
|
||||
FOC_MAX_Y - finger->y);
|
||||
priv->y_max - clamped_y);
|
||||
}
|
||||
}
|
||||
input_mt_report_pointer_emulation(dev, true);
|
||||
@@ -180,16 +185,6 @@ static void focaltech_process_abs_packet(struct psmouse *psmouse,
|
||||
|
||||
state->pressed = (packet[0] >> 4) & 1;
|
||||
|
||||
/*
|
||||
* packet[5] contains some kind of tool size in the most
|
||||
* significant nibble. 0xff is a special value (latching) that
|
||||
* signals a large contact area.
|
||||
*/
|
||||
if (packet[5] == 0xff) {
|
||||
state->fingers[finger].valid = false;
|
||||
return;
|
||||
}
|
||||
|
||||
state->fingers[finger].x = ((packet[1] & 0xf) << 8) | packet[2];
|
||||
state->fingers[finger].y = (packet[3] << 8) | packet[4];
|
||||
state->fingers[finger].valid = true;
|
||||
@@ -381,6 +376,23 @@ static int focaltech_read_size(struct psmouse *psmouse)
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void focaltech_set_resolution(struct psmouse *psmouse, unsigned int resolution)
|
||||
{
|
||||
/* not supported yet */
|
||||
}
|
||||
|
||||
static void focaltech_set_rate(struct psmouse *psmouse, unsigned int rate)
|
||||
{
|
||||
/* not supported yet */
|
||||
}
|
||||
|
||||
static void focaltech_set_scale(struct psmouse *psmouse,
|
||||
enum psmouse_scale scale)
|
||||
{
|
||||
/* not supported yet */
|
||||
}
|
||||
|
||||
int focaltech_init(struct psmouse *psmouse)
|
||||
{
|
||||
struct focaltech_data *priv;
|
||||
@@ -415,6 +427,14 @@ int focaltech_init(struct psmouse *psmouse)
|
||||
psmouse->cleanup = focaltech_reset;
|
||||
/* resync is not supported yet */
|
||||
psmouse->resync_time = 0;
|
||||
/*
|
||||
* rate/resolution/scale changes are not supported yet, and
|
||||
* the generic implementations of these functions seem to
|
||||
* confuse some touchpads
|
||||
*/
|
||||
psmouse->set_resolution = focaltech_set_resolution;
|
||||
psmouse->set_rate = focaltech_set_rate;
|
||||
psmouse->set_scale = focaltech_set_scale;
|
||||
|
||||
return 0;
|
||||
|
||||
|
||||
@@ -453,6 +453,17 @@ static void psmouse_set_rate(struct psmouse *psmouse, unsigned int rate)
|
||||
psmouse->rate = r;
|
||||
}
|
||||
|
||||
/*
|
||||
* Here we set the mouse scaling.
|
||||
*/
|
||||
|
||||
static void psmouse_set_scale(struct psmouse *psmouse, enum psmouse_scale scale)
|
||||
{
|
||||
ps2_command(&psmouse->ps2dev, NULL,
|
||||
scale == PSMOUSE_SCALE21 ? PSMOUSE_CMD_SETSCALE21 :
|
||||
PSMOUSE_CMD_SETSCALE11);
|
||||
}
|
||||
|
||||
/*
|
||||
* psmouse_poll() - default poll handler. Everyone except for ALPS uses it.
|
||||
*/
|
||||
@@ -715,6 +726,7 @@ static void psmouse_apply_defaults(struct psmouse *psmouse)
|
||||
|
||||
psmouse->set_rate = psmouse_set_rate;
|
||||
psmouse->set_resolution = psmouse_set_resolution;
|
||||
psmouse->set_scale = psmouse_set_scale;
|
||||
psmouse->poll = psmouse_poll;
|
||||
psmouse->protocol_handler = psmouse_process_byte;
|
||||
psmouse->pktsize = 3;
|
||||
@@ -1186,7 +1198,7 @@ static void psmouse_initialize(struct psmouse *psmouse)
|
||||
if (psmouse_max_proto != PSMOUSE_PS2) {
|
||||
psmouse->set_rate(psmouse, psmouse->rate);
|
||||
psmouse->set_resolution(psmouse, psmouse->resolution);
|
||||
ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_SETSCALE11);
|
||||
psmouse->set_scale(psmouse, PSMOUSE_SCALE11);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -36,6 +36,11 @@ typedef enum {
|
||||
PSMOUSE_FULL_PACKET
|
||||
} psmouse_ret_t;
|
||||
|
||||
enum psmouse_scale {
|
||||
PSMOUSE_SCALE11,
|
||||
PSMOUSE_SCALE21
|
||||
};
|
||||
|
||||
struct psmouse {
|
||||
void *private;
|
||||
struct input_dev *dev;
|
||||
@@ -67,6 +72,7 @@ struct psmouse {
|
||||
psmouse_ret_t (*protocol_handler)(struct psmouse *psmouse);
|
||||
void (*set_rate)(struct psmouse *psmouse, unsigned int rate);
|
||||
void (*set_resolution)(struct psmouse *psmouse, unsigned int resolution);
|
||||
void (*set_scale)(struct psmouse *psmouse, enum psmouse_scale scale);
|
||||
|
||||
int (*reconnect)(struct psmouse *psmouse);
|
||||
void (*disconnect)(struct psmouse *psmouse);
|
||||
|
||||
@@ -67,9 +67,6 @@
|
||||
#define X_MAX_POSITIVE 8176
|
||||
#define Y_MAX_POSITIVE 8176
|
||||
|
||||
/* maximum ABS_MT_POSITION displacement (in mm) */
|
||||
#define DMAX 10
|
||||
|
||||
/*****************************************************************************
|
||||
* Stuff we need even when we do not want native Synaptics support
|
||||
****************************************************************************/
|
||||
@@ -123,32 +120,41 @@ void synaptics_reset(struct psmouse *psmouse)
|
||||
|
||||
static bool cr48_profile_sensor;
|
||||
|
||||
#define ANY_BOARD_ID 0
|
||||
struct min_max_quirk {
|
||||
const char * const *pnp_ids;
|
||||
struct {
|
||||
unsigned long int min, max;
|
||||
} board_id;
|
||||
int x_min, x_max, y_min, y_max;
|
||||
};
|
||||
|
||||
static const struct min_max_quirk min_max_pnpid_table[] = {
|
||||
{
|
||||
(const char * const []){"LEN0033", NULL},
|
||||
{ANY_BOARD_ID, ANY_BOARD_ID},
|
||||
1024, 5052, 2258, 4832
|
||||
},
|
||||
{
|
||||
(const char * const []){"LEN0035", "LEN0042", NULL},
|
||||
(const char * const []){"LEN0042", NULL},
|
||||
{ANY_BOARD_ID, ANY_BOARD_ID},
|
||||
1232, 5710, 1156, 4696
|
||||
},
|
||||
{
|
||||
(const char * const []){"LEN0034", "LEN0036", "LEN0037",
|
||||
"LEN0039", "LEN2002", "LEN2004",
|
||||
NULL},
|
||||
{ANY_BOARD_ID, 2961},
|
||||
1024, 5112, 2024, 4832
|
||||
},
|
||||
{
|
||||
(const char * const []){"LEN2001", NULL},
|
||||
{ANY_BOARD_ID, ANY_BOARD_ID},
|
||||
1024, 5022, 2508, 4832
|
||||
},
|
||||
{
|
||||
(const char * const []){"LEN2006", NULL},
|
||||
{ANY_BOARD_ID, ANY_BOARD_ID},
|
||||
1264, 5675, 1171, 4688
|
||||
},
|
||||
{ }
|
||||
@@ -175,9 +181,7 @@ static const char * const topbuttonpad_pnp_ids[] = {
|
||||
"LEN0041",
|
||||
"LEN0042", /* Yoga */
|
||||
"LEN0045",
|
||||
"LEN0046",
|
||||
"LEN0047",
|
||||
"LEN0048",
|
||||
"LEN0049",
|
||||
"LEN2000",
|
||||
"LEN2001", /* Edge E431 */
|
||||
@@ -242,18 +246,39 @@ static int synaptics_model_id(struct psmouse *psmouse)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int synaptics_more_extended_queries(struct psmouse *psmouse)
|
||||
{
|
||||
struct synaptics_data *priv = psmouse->private;
|
||||
unsigned char buf[3];
|
||||
|
||||
if (synaptics_send_cmd(psmouse, SYN_QUE_MEXT_CAPAB_10, buf))
|
||||
return -1;
|
||||
|
||||
priv->ext_cap_10 = (buf[0]<<16) | (buf[1]<<8) | buf[2];
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Read the board id from the touchpad
|
||||
* Read the board id and the "More Extended Queries" from the touchpad
|
||||
* The board id is encoded in the "QUERY MODES" response
|
||||
*/
|
||||
static int synaptics_board_id(struct psmouse *psmouse)
|
||||
static int synaptics_query_modes(struct psmouse *psmouse)
|
||||
{
|
||||
struct synaptics_data *priv = psmouse->private;
|
||||
unsigned char bid[3];
|
||||
|
||||
/* firmwares prior 7.5 have no board_id encoded */
|
||||
if (SYN_ID_FULL(priv->identity) < 0x705)
|
||||
return 0;
|
||||
|
||||
if (synaptics_send_cmd(psmouse, SYN_QUE_MODES, bid))
|
||||
return -1;
|
||||
priv->board_id = ((bid[0] & 0xfc) << 6) | bid[1];
|
||||
|
||||
if (SYN_MEXT_CAP_BIT(bid[0]))
|
||||
return synaptics_more_extended_queries(psmouse);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -353,7 +378,6 @@ static int synaptics_resolution(struct psmouse *psmouse)
|
||||
{
|
||||
struct synaptics_data *priv = psmouse->private;
|
||||
unsigned char resp[3];
|
||||
int i;
|
||||
|
||||
if (SYN_ID_MAJOR(priv->identity) < 4)
|
||||
return 0;
|
||||
@@ -365,17 +389,6 @@ static int synaptics_resolution(struct psmouse *psmouse)
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; min_max_pnpid_table[i].pnp_ids; i++) {
|
||||
if (psmouse_matches_pnp_id(psmouse,
|
||||
min_max_pnpid_table[i].pnp_ids)) {
|
||||
priv->x_min = min_max_pnpid_table[i].x_min;
|
||||
priv->x_max = min_max_pnpid_table[i].x_max;
|
||||
priv->y_min = min_max_pnpid_table[i].y_min;
|
||||
priv->y_max = min_max_pnpid_table[i].y_max;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 5 &&
|
||||
SYN_CAP_MAX_DIMENSIONS(priv->ext_cap_0c)) {
|
||||
if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_MAX_COORDS, resp)) {
|
||||
@@ -384,23 +397,69 @@ static int synaptics_resolution(struct psmouse *psmouse)
|
||||
} else {
|
||||
priv->x_max = (resp[0] << 5) | ((resp[1] & 0x0f) << 1);
|
||||
priv->y_max = (resp[2] << 5) | ((resp[1] & 0xf0) >> 3);
|
||||
psmouse_info(psmouse,
|
||||
"queried max coordinates: x [..%d], y [..%d]\n",
|
||||
priv->x_max, priv->y_max);
|
||||
}
|
||||
}
|
||||
|
||||
if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 7 &&
|
||||
SYN_CAP_MIN_DIMENSIONS(priv->ext_cap_0c)) {
|
||||
if (SYN_CAP_MIN_DIMENSIONS(priv->ext_cap_0c) &&
|
||||
(SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 7 ||
|
||||
/*
|
||||
* Firmware v8.1 does not report proper number of extended
|
||||
* capabilities, but has been proven to report correct min
|
||||
* coordinates.
|
||||
*/
|
||||
SYN_ID_FULL(priv->identity) == 0x801)) {
|
||||
if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_MIN_COORDS, resp)) {
|
||||
psmouse_warn(psmouse,
|
||||
"device claims to have min coordinates query, but I'm not able to read it.\n");
|
||||
} else {
|
||||
priv->x_min = (resp[0] << 5) | ((resp[1] & 0x0f) << 1);
|
||||
priv->y_min = (resp[2] << 5) | ((resp[1] & 0xf0) >> 3);
|
||||
psmouse_info(psmouse,
|
||||
"queried min coordinates: x [%d..], y [%d..]\n",
|
||||
priv->x_min, priv->y_min);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Apply quirk(s) if the hardware matches
|
||||
*/
|
||||
|
||||
static void synaptics_apply_quirks(struct psmouse *psmouse)
|
||||
{
|
||||
struct synaptics_data *priv = psmouse->private;
|
||||
int i;
|
||||
|
||||
for (i = 0; min_max_pnpid_table[i].pnp_ids; i++) {
|
||||
if (!psmouse_matches_pnp_id(psmouse,
|
||||
min_max_pnpid_table[i].pnp_ids))
|
||||
continue;
|
||||
|
||||
if (min_max_pnpid_table[i].board_id.min != ANY_BOARD_ID &&
|
||||
priv->board_id < min_max_pnpid_table[i].board_id.min)
|
||||
continue;
|
||||
|
||||
if (min_max_pnpid_table[i].board_id.max != ANY_BOARD_ID &&
|
||||
priv->board_id > min_max_pnpid_table[i].board_id.max)
|
||||
continue;
|
||||
|
||||
priv->x_min = min_max_pnpid_table[i].x_min;
|
||||
priv->x_max = min_max_pnpid_table[i].x_max;
|
||||
priv->y_min = min_max_pnpid_table[i].y_min;
|
||||
priv->y_max = min_max_pnpid_table[i].y_max;
|
||||
psmouse_info(psmouse,
|
||||
"quirked min/max coordinates: x [%d..%d], y [%d..%d]\n",
|
||||
priv->x_min, priv->x_max,
|
||||
priv->y_min, priv->y_max);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static int synaptics_query_hardware(struct psmouse *psmouse)
|
||||
{
|
||||
if (synaptics_identify(psmouse))
|
||||
@@ -409,13 +468,15 @@ static int synaptics_query_hardware(struct psmouse *psmouse)
|
||||
return -1;
|
||||
if (synaptics_firmware_id(psmouse))
|
||||
return -1;
|
||||
if (synaptics_board_id(psmouse))
|
||||
if (synaptics_query_modes(psmouse))
|
||||
return -1;
|
||||
if (synaptics_capability(psmouse))
|
||||
return -1;
|
||||
if (synaptics_resolution(psmouse))
|
||||
return -1;
|
||||
|
||||
synaptics_apply_quirks(psmouse);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -523,18 +584,22 @@ static int synaptics_is_pt_packet(unsigned char *buf)
|
||||
return (buf[0] & 0xFC) == 0x84 && (buf[3] & 0xCC) == 0xC4;
|
||||
}
|
||||
|
||||
static void synaptics_pass_pt_packet(struct serio *ptport, unsigned char *packet)
|
||||
static void synaptics_pass_pt_packet(struct psmouse *psmouse,
|
||||
struct serio *ptport,
|
||||
unsigned char *packet)
|
||||
{
|
||||
struct synaptics_data *priv = psmouse->private;
|
||||
struct psmouse *child = serio_get_drvdata(ptport);
|
||||
|
||||
if (child && child->state == PSMOUSE_ACTIVATED) {
|
||||
serio_interrupt(ptport, packet[1], 0);
|
||||
serio_interrupt(ptport, packet[1] | priv->pt_buttons, 0);
|
||||
serio_interrupt(ptport, packet[4], 0);
|
||||
serio_interrupt(ptport, packet[5], 0);
|
||||
if (child->pktsize == 4)
|
||||
serio_interrupt(ptport, packet[2], 0);
|
||||
} else
|
||||
} else {
|
||||
serio_interrupt(ptport, packet[1], 0);
|
||||
}
|
||||
}
|
||||
|
||||
static void synaptics_pt_activate(struct psmouse *psmouse)
|
||||
@@ -612,6 +677,18 @@ static void synaptics_parse_agm(const unsigned char buf[],
|
||||
}
|
||||
}
|
||||
|
||||
static void synaptics_parse_ext_buttons(const unsigned char buf[],
|
||||
struct synaptics_data *priv,
|
||||
struct synaptics_hw_state *hw)
|
||||
{
|
||||
unsigned int ext_bits =
|
||||
(SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) + 1) >> 1;
|
||||
unsigned int ext_mask = GENMASK(ext_bits - 1, 0);
|
||||
|
||||
hw->ext_buttons = buf[4] & ext_mask;
|
||||
hw->ext_buttons |= (buf[5] & ext_mask) << ext_bits;
|
||||
}
|
||||
|
||||
static int synaptics_parse_hw_state(const unsigned char buf[],
|
||||
struct synaptics_data *priv,
|
||||
struct synaptics_hw_state *hw)
|
||||
@@ -696,28 +773,9 @@ static int synaptics_parse_hw_state(const unsigned char buf[],
|
||||
hw->down = ((buf[0] ^ buf[3]) & 0x02) ? 1 : 0;
|
||||
}
|
||||
|
||||
if (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) &&
|
||||
if (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) > 0 &&
|
||||
((buf[0] ^ buf[3]) & 0x02)) {
|
||||
switch (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) & ~0x01) {
|
||||
default:
|
||||
/*
|
||||
* if nExtBtn is greater than 8 it should be
|
||||
* considered invalid and treated as 0
|
||||
*/
|
||||
break;
|
||||
case 8:
|
||||
hw->ext_buttons |= ((buf[5] & 0x08)) ? 0x80 : 0;
|
||||
hw->ext_buttons |= ((buf[4] & 0x08)) ? 0x40 : 0;
|
||||
case 6:
|
||||
hw->ext_buttons |= ((buf[5] & 0x04)) ? 0x20 : 0;
|
||||
hw->ext_buttons |= ((buf[4] & 0x04)) ? 0x10 : 0;
|
||||
case 4:
|
||||
hw->ext_buttons |= ((buf[5] & 0x02)) ? 0x08 : 0;
|
||||
hw->ext_buttons |= ((buf[4] & 0x02)) ? 0x04 : 0;
|
||||
case 2:
|
||||
hw->ext_buttons |= ((buf[5] & 0x01)) ? 0x02 : 0;
|
||||
hw->ext_buttons |= ((buf[4] & 0x01)) ? 0x01 : 0;
|
||||
}
|
||||
synaptics_parse_ext_buttons(buf, priv, hw);
|
||||
}
|
||||
} else {
|
||||
hw->x = (((buf[1] & 0x1f) << 8) | buf[2]);
|
||||
@@ -779,12 +837,54 @@ static void synaptics_report_semi_mt_data(struct input_dev *dev,
|
||||
}
|
||||
}
|
||||
|
||||
static void synaptics_report_ext_buttons(struct psmouse *psmouse,
|
||||
const struct synaptics_hw_state *hw)
|
||||
{
|
||||
struct input_dev *dev = psmouse->dev;
|
||||
struct synaptics_data *priv = psmouse->private;
|
||||
int ext_bits = (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) + 1) >> 1;
|
||||
char buf[6] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
|
||||
int i;
|
||||
|
||||
if (!SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap))
|
||||
return;
|
||||
|
||||
/* Bug in FW 8.1, buttons are reported only when ExtBit is 1 */
|
||||
if (SYN_ID_FULL(priv->identity) == 0x801 &&
|
||||
!((psmouse->packet[0] ^ psmouse->packet[3]) & 0x02))
|
||||
return;
|
||||
|
||||
if (!SYN_CAP_EXT_BUTTONS_STICK(priv->ext_cap_10)) {
|
||||
for (i = 0; i < ext_bits; i++) {
|
||||
input_report_key(dev, BTN_0 + 2 * i,
|
||||
hw->ext_buttons & (1 << i));
|
||||
input_report_key(dev, BTN_1 + 2 * i,
|
||||
hw->ext_buttons & (1 << (i + ext_bits)));
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
* This generation of touchpads has the trackstick buttons
|
||||
* physically wired to the touchpad. Re-route them through
|
||||
* the pass-through interface.
|
||||
*/
|
||||
if (!priv->pt_port)
|
||||
return;
|
||||
|
||||
/* The trackstick expects at most 3 buttons */
|
||||
priv->pt_buttons = SYN_CAP_EXT_BUTTON_STICK_L(hw->ext_buttons) |
|
||||
SYN_CAP_EXT_BUTTON_STICK_R(hw->ext_buttons) << 1 |
|
||||
SYN_CAP_EXT_BUTTON_STICK_M(hw->ext_buttons) << 2;
|
||||
|
||||
synaptics_pass_pt_packet(psmouse, priv->pt_port, buf);
|
||||
}
|
||||
|
||||
static void synaptics_report_buttons(struct psmouse *psmouse,
|
||||
const struct synaptics_hw_state *hw)
|
||||
{
|
||||
struct input_dev *dev = psmouse->dev;
|
||||
struct synaptics_data *priv = psmouse->private;
|
||||
int i;
|
||||
|
||||
input_report_key(dev, BTN_LEFT, hw->left);
|
||||
input_report_key(dev, BTN_RIGHT, hw->right);
|
||||
@@ -797,8 +897,7 @@ static void synaptics_report_buttons(struct psmouse *psmouse,
|
||||
input_report_key(dev, BTN_BACK, hw->down);
|
||||
}
|
||||
|
||||
for (i = 0; i < SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap); i++)
|
||||
input_report_key(dev, BTN_0 + i, hw->ext_buttons & (1 << i));
|
||||
synaptics_report_ext_buttons(psmouse, hw);
|
||||
}
|
||||
|
||||
static void synaptics_report_mt_data(struct psmouse *psmouse,
|
||||
@@ -818,7 +917,7 @@ static void synaptics_report_mt_data(struct psmouse *psmouse,
|
||||
pos[i].y = synaptics_invert_y(hw[i]->y);
|
||||
}
|
||||
|
||||
input_mt_assign_slots(dev, slot, pos, nsemi, DMAX * priv->x_res);
|
||||
input_mt_assign_slots(dev, slot, pos, nsemi, 0);
|
||||
|
||||
for (i = 0; i < nsemi; i++) {
|
||||
input_mt_slot(dev, slot[i]);
|
||||
@@ -1019,7 +1118,8 @@ static psmouse_ret_t synaptics_process_byte(struct psmouse *psmouse)
|
||||
if (SYN_CAP_PASS_THROUGH(priv->capabilities) &&
|
||||
synaptics_is_pt_packet(psmouse->packet)) {
|
||||
if (priv->pt_port)
|
||||
synaptics_pass_pt_packet(priv->pt_port, psmouse->packet);
|
||||
synaptics_pass_pt_packet(psmouse, priv->pt_port,
|
||||
psmouse->packet);
|
||||
} else
|
||||
synaptics_process_packet(psmouse);
|
||||
|
||||
@@ -1121,8 +1221,9 @@ static void set_input_params(struct psmouse *psmouse,
|
||||
__set_bit(BTN_BACK, dev->keybit);
|
||||
}
|
||||
|
||||
for (i = 0; i < SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap); i++)
|
||||
__set_bit(BTN_0 + i, dev->keybit);
|
||||
if (!SYN_CAP_EXT_BUTTONS_STICK(priv->ext_cap_10))
|
||||
for (i = 0; i < SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap); i++)
|
||||
__set_bit(BTN_0 + i, dev->keybit);
|
||||
|
||||
__clear_bit(EV_REL, dev->evbit);
|
||||
__clear_bit(REL_X, dev->relbit);
|
||||
@@ -1130,7 +1231,8 @@ static void set_input_params(struct psmouse *psmouse,
|
||||
|
||||
if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) {
|
||||
__set_bit(INPUT_PROP_BUTTONPAD, dev->propbit);
|
||||
if (psmouse_matches_pnp_id(psmouse, topbuttonpad_pnp_ids))
|
||||
if (psmouse_matches_pnp_id(psmouse, topbuttonpad_pnp_ids) &&
|
||||
!SYN_CAP_EXT_BUTTONS_STICK(priv->ext_cap_10))
|
||||
__set_bit(INPUT_PROP_TOPBUTTONPAD, dev->propbit);
|
||||
/* Clickpads report only left button */
|
||||
__clear_bit(BTN_RIGHT, dev->keybit);
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
#define SYN_QUE_EXT_CAPAB_0C 0x0c
|
||||
#define SYN_QUE_EXT_MAX_COORDS 0x0d
|
||||
#define SYN_QUE_EXT_MIN_COORDS 0x0f
|
||||
#define SYN_QUE_MEXT_CAPAB_10 0x10
|
||||
|
||||
/* synatics modes */
|
||||
#define SYN_BIT_ABSOLUTE_MODE (1 << 7)
|
||||
@@ -53,6 +54,7 @@
|
||||
#define SYN_EXT_CAP_REQUESTS(c) (((c) & 0x700000) >> 20)
|
||||
#define SYN_CAP_MULTI_BUTTON_NO(ec) (((ec) & 0x00f000) >> 12)
|
||||
#define SYN_CAP_PRODUCT_ID(ec) (((ec) & 0xff0000) >> 16)
|
||||
#define SYN_MEXT_CAP_BIT(m) ((m) & (1 << 1))
|
||||
|
||||
/*
|
||||
* The following describes response for the 0x0c query.
|
||||
@@ -89,6 +91,30 @@
|
||||
#define SYN_CAP_REDUCED_FILTERING(ex0c) ((ex0c) & 0x000400)
|
||||
#define SYN_CAP_IMAGE_SENSOR(ex0c) ((ex0c) & 0x000800)
|
||||
|
||||
/*
|
||||
* The following descibes response for the 0x10 query.
|
||||
*
|
||||
* byte mask name meaning
|
||||
* ---- ---- ------- ------------
|
||||
* 1 0x01 ext buttons are stick buttons exported in the extended
|
||||
* capability are actually meant to be used
|
||||
* by the tracktick (pass-through).
|
||||
* 1 0x02 SecurePad the touchpad is a SecurePad, so it
|
||||
* contains a built-in fingerprint reader.
|
||||
* 1 0xe0 more ext count how many more extented queries are
|
||||
* available after this one.
|
||||
* 2 0xff SecurePad width the width of the SecurePad fingerprint
|
||||
* reader.
|
||||
* 3 0xff SecurePad height the height of the SecurePad fingerprint
|
||||
* reader.
|
||||
*/
|
||||
#define SYN_CAP_EXT_BUTTONS_STICK(ex10) ((ex10) & 0x010000)
|
||||
#define SYN_CAP_SECUREPAD(ex10) ((ex10) & 0x020000)
|
||||
|
||||
#define SYN_CAP_EXT_BUTTON_STICK_L(eb) (!!((eb) & 0x01))
|
||||
#define SYN_CAP_EXT_BUTTON_STICK_M(eb) (!!((eb) & 0x02))
|
||||
#define SYN_CAP_EXT_BUTTON_STICK_R(eb) (!!((eb) & 0x04))
|
||||
|
||||
/* synaptics modes query bits */
|
||||
#define SYN_MODE_ABSOLUTE(m) ((m) & (1 << 7))
|
||||
#define SYN_MODE_RATE(m) ((m) & (1 << 6))
|
||||
@@ -143,6 +169,7 @@ struct synaptics_data {
|
||||
unsigned long int capabilities; /* Capabilities */
|
||||
unsigned long int ext_cap; /* Extended Capabilities */
|
||||
unsigned long int ext_cap_0c; /* Ext Caps from 0x0c query */
|
||||
unsigned long int ext_cap_10; /* Ext Caps from 0x10 query */
|
||||
unsigned long int identity; /* Identification */
|
||||
unsigned int x_res, y_res; /* X/Y resolution in units/mm */
|
||||
unsigned int x_max, y_max; /* Max coordinates (from FW) */
|
||||
@@ -156,6 +183,7 @@ struct synaptics_data {
|
||||
bool disable_gesture; /* disable gestures */
|
||||
|
||||
struct serio *pt_port; /* Pass-through serio port */
|
||||
unsigned char pt_buttons; /* Pass-through buttons */
|
||||
|
||||
/*
|
||||
* Last received Advanced Gesture Mode (AGM) packet. An AGM packet
|
||||
|
||||
Reference in New Issue
Block a user