|
@@ -347,15 +347,6 @@ static int synaptics_resolution(struct psmouse *psmouse)
|
|
unsigned char resp[3];
|
|
unsigned char resp[3];
|
|
int i;
|
|
int i;
|
|
|
|
|
|
- for (i = 0; min_max_pnpid_table[i].pnp_ids; i++)
|
|
|
|
- if (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_ID_MAJOR(priv->identity) < 4)
|
|
if (SYN_ID_MAJOR(priv->identity) < 4)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
@@ -366,6 +357,16 @@ static int synaptics_resolution(struct psmouse *psmouse)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ for (i = 0; min_max_pnpid_table[i].pnp_ids; i++) {
|
|
|
|
+ if (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 &&
|
|
if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 5 &&
|
|
SYN_CAP_MAX_DIMENSIONS(priv->ext_cap_0c)) {
|
|
SYN_CAP_MAX_DIMENSIONS(priv->ext_cap_0c)) {
|
|
if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_MAX_COORDS, resp)) {
|
|
if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_MAX_COORDS, resp)) {
|