Input: synaptics - add support for reporting x/y resolution
Subsystems (2)
PATCH 1/1 Input: synaptics - add support for reporting x/y resolution
Synaptics uses anisotropic coordinate system. On wide touchpads vertical coordinate resolution can be twice as high as horizontal leading to unequal sensitivity. Make x and y coordinate resolution available so that differences can be compensated.
--- drivers/input/mouse/synaptics.c | 27 +++++++++++++++++++++++++++ drivers/input/mouse/synaptics.h | 2 ++ include/linux/input.h | 2 ++ 3 files changed, 31 insertions(+), 0 deletions(-)
(quoted diff) +0 -0
b/drivers/input/mouse/synaptics.c
index f3e4f7b..9363953 100644
drivers/input/mouse/synaptics.c +0 -0
@@ -180,6 +180,29 @@ static int synaptics_identify(struct psmouse
*psmouse)
return -1;
}
+/*
+ * Read touchpad resolution
+ * Resolution is left zero if touchpad does not support the query
+ */
+static int synaptics_resolution(struct psmouse *psmouse) +{
+ struct synaptics_data *priv = psmouse->private;
+ unsigned char res[3];
+
+ if (SYN_ID_MAJOR(priv->identity) < 4)
+ return 0;
+
+ if (synaptics_send_cmd(psmouse, SYN_QUE_RESOLUTION, res))
+ return 0;
+
+ if (res[1] == 0x80) {
+ priv->x_res = res[0];
+ priv->y_res = res[2];
+ }
+
+ return 0;
+}
+
static int synaptics_query_hardware(struct psmouse *psmouse) {
if (synaptics_identify(psmouse))
@@ -188,6 +211,8 @@ static int synaptics_query_hardware(struct psmouse *psmouse)
return -1;
if (synaptics_capability(psmouse))
return -1;
+ if (synaptics_resolution(psmouse))
+ return -1;
return 0;
}
@@ -534,6 +559,8 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)
set_bit(EV_ABS, dev->evbit);
input_set_abs_params(dev, ABS_X, XMIN_NOMINAL, XMAX_NOMINAL, 0, 0); input_set_abs_params(dev, ABS_Y, YMIN_NOMINAL, YMAX_NOMINAL, 0, 0);
+ input_set_abs_params(dev, ABS_RESX, 0, priv->x_res, 0, 0);
+ input_set_abs_params(dev, ABS_RESY, 0, priv->y_res, 0, 0);
input_set_abs_params(dev, ABS_PRESSURE, 0, 255, 0, 0); set_bit(ABS_TOOL_WIDTH, dev->absbit);
(quoted diff) +0 -0
b/drivers/input/mouse/synaptics.h
index 02aa4cf..e9a69c9 100644
drivers/input/mouse/synaptics.h +2 -0
@@ -101,6 +101,8 @@ struct synaptics_data {unsigned char pkt_type;/* packet type - old, new, etc */ unsigned char mode;/* current mode byte */ int scroll; +int x_res;/* x resolution in units/mm */ +int y_res;/* y resolution in units/mm */ };int synaptics_detect (struct psmouse *psmouse,int set_properties);
include/linux/input.h +2 -0
@@ -645,6 +645,8 @@ struct input_absinfo {#define ABS_TILT_Y 0x1b#define ABS_TOOL_WIDTH 0x1c#define ABS_VOLUME 0x20 +#define ABS_RESX 0x26 +#define ABS_RESY 0x27#define ABS_MISC 0x28#define ABS_MT_TOUCH_MAJOR 0x30/* Major axis of touching ellipse */
Signature · 1 line
1.6.0.4
PATCH 1/1 Input: synaptics - add support for reporting x/y resolution
Synaptics uses anisotropic coordinate system. On wide touchpads vertical coordinate resolution can be twice as high as horizontal leading to unequal sensitivity. Make x and y coordinate resolution available so that differences can be compensated.
---
I'm reposting this to fix the line wrapping problems, sorry!
drivers/input/mouse/synaptics.c | 27 +++++++++++++++++++++++++++ drivers/input/mouse/synaptics.h | 2 ++ include/linux/input.h | 2 ++ 3 files changed, 31 insertions(+), 0 deletions(-)
drivers/input/mouse/synaptics.c +27 -0
@@ -180,6 +180,29 @@ static int synaptics_identify(struct psmouse *psmouse)return -1 ; } +/* +* Read touchpad resolution +* Resolution is left zero if touchpad does not support the query +*/ +static int synaptics_resolution (struct psmouse *psmouse) +{ +struct synaptics_data *priv = psmouse->private; +unsigned char res[3 ]; + +if (SYN_ID_MAJOR (priv->identity) <4 ) +return 0 ; + +if (synaptics_send_cmd (psmouse,SYN_QUE_RESOLUTION , res)) +return 0 ; + +if (res[1 ] ==0x80 ) { + priv->x_res = res[0 ]; + priv->y_res = res[2 ]; + } + +return 0 ; +} +static int synaptics_query_hardware (struct psmouse *psmouse) {if (synaptics_identify (psmouse))
@@ -188,6 +211,8 @@ static int synaptics_query_hardware(struct psmouse *psmouse)return -1 ;if (synaptics_capability (psmouse))return -1 ; +if (synaptics_resolution (psmouse)) +return -1 ;return 0 ; }
@@ -534,6 +559,8 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)set_bit (EV_ABS , dev->evbit);input_set_abs_params (dev,ABS_X ,XMIN_NOMINAL ,XMAX_NOMINAL ,0 ,0 );input_set_abs_params (dev,ABS_Y ,YMIN_NOMINAL ,YMAX_NOMINAL ,0 ,0 ); +input_set_abs_params (dev,ABS_RESX ,0 , priv->x_res,0 ,0 ); +input_set_abs_params (dev,ABS_RESY ,0 , priv->y_res,0 ,0 );input_set_abs_params (dev,ABS_PRESSURE ,0 ,255 ,0 ,0 );set_bit (ABS_TOOL_WIDTH , dev->absbit);
drivers/input/mouse/synaptics.h +2 -0
@@ -101,6 +101,8 @@ struct synaptics_data {unsigned char pkt_type;/* packet type - old, new, etc */ unsigned char mode;/* current mode byte */ int scroll; +int x_res;/* x resolution in units/mm */ +int y_res;/* y resolution in units/mm */ };int synaptics_detect (struct psmouse *psmouse,int set_properties);
include/linux/input.h +2 -0
@@ -645,6 +645,8 @@ struct input_absinfo {#define ABS_TILT_Y 0x1b#define ABS_TOOL_WIDTH 0x1c#define ABS_VOLUME 0x20 +#define ABS_RESX 0x26 +#define ABS_RESY 0x27#define ABS_MISC 0x28#define ABS_MT_TOUCH_MAJOR 0x30/* Major axis of touching ellipse */
Signature · 1 line
1.6.0.4
PATCH 1/1 Input: synaptics - add support for reporting x/y resolution
Synaptics uses anisotropic coordinate system. On some wide touchpads vertical resolution can be twice as high as horizontal leading to unequal sensitivity. To allow compensation add support for reading the resolution.
---
This is revision 2 of the patch.
Added more validity checks for resolution query, according to chapter 3.5.1 in Synaptics TouchPad Interfacing Guide [1].
[1] http://www.synaptics.com/sites/default/files/ACF126.pdf
drivers/input/mouse/synaptics.c | 27 +++++++++++++++++++++++++++ drivers/input/mouse/synaptics.h | 2 ++ include/linux/input.h | 2 ++ 3 files changed, 31 insertions(+), 0 deletions(-)
drivers/input/mouse/synaptics.c +27 -0
@@ -180,6 +180,29 @@ static int synaptics_identify(struct psmouse *psmouse)return -1 ; } +/* +* Read touchpad resolution +* Resolution is left zero if touchpad does not support the query +*/ +static int synaptics_resolution (struct psmouse *psmouse) +{ +struct synaptics_data *priv = psmouse->private; +unsigned char res[3 ]; + +if (SYN_ID_MAJOR (priv->identity) <4 ) +return 0 ; + +if (synaptics_send_cmd (psmouse,SYN_QUE_RESOLUTION , res)) +return 0 ; + +if ((res[0 ] !=0 ) && (res[1 ] &0x80 ) && (res[2 ] !=0 )) { + priv->x_res = res[0 ]; + priv->y_res = res[2 ]; + } + +return 0 ; +} +static int synaptics_query_hardware (struct psmouse *psmouse) {if (synaptics_identify (psmouse))
@@ -188,6 +211,8 @@ static int synaptics_query_hardware(struct psmouse *psmouse)return -1 ;if (synaptics_capability (psmouse))return -1 ; +if (synaptics_resolution (psmouse)) +return -1 ;return 0 ; }
@@ -534,6 +559,8 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)set_bit (EV_ABS , dev->evbit);input_set_abs_params (dev,ABS_X ,XMIN_NOMINAL ,XMAX_NOMINAL ,0 ,0 );input_set_abs_params (dev,ABS_Y ,YMIN_NOMINAL ,YMAX_NOMINAL ,0 ,0 ); +input_set_abs_params (dev,ABS_RESX ,0 , priv->x_res,0 ,0 ); +input_set_abs_params (dev,ABS_RESY ,0 , priv->y_res,0 ,0 );input_set_abs_params (dev,ABS_PRESSURE ,0 ,255 ,0 ,0 );set_bit (ABS_TOOL_WIDTH , dev->absbit);
drivers/input/mouse/synaptics.h +2 -0
@@ -101,6 +101,8 @@ struct synaptics_data {unsigned char pkt_type;/* packet type - old, new, etc */ unsigned char mode;/* current mode byte */ int scroll; +int x_res;/* x resolution in units/mm */ +int y_res;/* y resolution in units/mm */ };int synaptics_detect (struct psmouse *psmouse,int set_properties);
include/linux/input.h +2 -0
@@ -645,6 +645,8 @@ struct input_absinfo {#define ABS_TILT_Y 0x1b#define ABS_TOOL_WIDTH 0x1c#define ABS_VOLUME 0x20 +#define ABS_RESX 0x26 +#define ABS_RESY 0x27#define ABS_MISC 0x28#define ABS_MT_TOUCH_MAJOR 0x30/* Major axis of touching ellipse */
Signature · 1 line
1.6.0.4
Dmitry Torokhov
maintainerHi Tero,
Quoted 5 lines · Tero Saarni
Synaptics uses anisotropic coordinate system. On wide touchpads vertical coordinate resolution can be twice as high as horizontal leading to unequal sensitivity. Make x and y coordinate resolution available so that differences can be compensated.
Thank you for the patch.
include/linux/input.h struct input_absinfo { · line 649
Quoted 2 lines
include/linux/input.h +2
-0+#define ABS_RESX 0x26 +#define ABS_RESY 0x27
This data is not part of dynamic state of the device but rather describes it's physical characteristics and as such should not be transmitted as input events. We should consider extending input_absinfo and making this data available via EVIOCGABS ioctl but we need to be careful with keeping compatibility with existing clients.
Signature · 1 line
Dmitry
Quoted 8 lines · Dmitry Torokhov
include/linux/input.h struct input_absinfo { · line 649
Quoted 2 lines
include/linux/input.h +2
-0+#define ABS_RESX 0x26 +#define ABS_RESY 0x27This data is not part of dynamic state of the device but rather describes it's physical characteristics and as such should not be transmitted as input events. We should consider extending
input_absinfoand making this data available via EVIOCGABS ioctl but we need to be careful with keeping compatibility with existing clients.
Thanks for your reply!
What kind of extension do you mean?
Making it available via EVIOCGABS ioctl was my intention too but extending by adding new ABS_nnn was the only obvious way I came up with. All the other similar uses of input_absinfo seem to describe static limits of dynamic parameters (like max and min y coordinates) so I agree that resolution is not a perfect fit into the group, For resolution I never need to call input_report_abs().
I'm very new to the area so please bear with me! :-)
Signature · 5 lines
Tero -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Dmitry Torokhov
maintainerQuoted 12 lines · Tero Saarni
Quoted 8 lines · Dmitry Torokhov
include/linux/input.h struct input_absinfo { · line 649
Quoted 2 lines
include/linux/input.h +2
-0+#define ABS_RESX 0x26 +#define ABS_RESY 0x27This data is not part of dynamic state of the device but rather describes it's physical characteristics and as such should not be transmitted as input events. We should consider extending
input_absinfoand making this data available via EVIOCGABS ioctl but we need to be careful with keeping compatibility with existing clients.Thanks for your reply!
Quoted 9 lines
What kind of extension do you mean?
Making it available via EVIOCGABS ioctl was my intention too but extending by adding new
ABS_nnnwas the only obvious way I came up with. All the other similar uses ofinput_absinfoseem to describe static limits of dynamic parameters (like max and min y coordinates) so I agree that resolution is not a perfect fit into the group, For resolution I never need to callinput_report_abs().
Well, we could add '__u32 resolution;' field to struct input_absinfo but we need to be really careful not to break applications using old (smaller) structures with newer kernels.
Signature · 5 lines
Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 1/1 Input: synaptics - add support for reporting x/y resolution
Synaptics uses anisotropic coordinate system. On some wide touchpads vertical resolution can be twice as high as horizontal which causes unequal sensitivity on x/y directions. Add support for reading the resolution with EVIOCGABS ioctl.
---
Here's a new version of the patch I posted last week. I've revised it according to comments from Dmitry. Please comment if I got the idea completely wrong or if there's something I could fine tune.
I had some doubts regarding my change in set_input_params() where the parameters generally seemed to be set to input_dev by calling input_set_abs_params() helper function. I did not add new resolution parameter to this function since its use was so wide spread. I just assign the resolution parameters directly which seemed more practical for me.
drivers/input/evdev.c | 8 ++++++-- drivers/input/mouse/synaptics.c | 28 ++++++++++++++++++++++++++++ drivers/input/mouse/synaptics.h | 2 ++ include/linux/input.h | 2 ++ 4 files changed, 38 insertions(+), 2 deletions(-)
drivers/input/evdev.c +6 -2
@@ -626,8 +626,10 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, abs.maximum = dev->absmax[t]; abs.fuzz = dev->absfuzz[t]; abs.flat = dev->absflat[t]; + abs.resolution = dev->absres[t]; -if (copy_to_user (p, &abs,sizeof (struct input_absinfo ))) +if (copy_to_user (p, &abs, +min (_IOC_SIZE (cmd),sizeof (struct input_absinfo ))))return -EFAULT ;return 0 ;
@@ -655,7 +657,7 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, t =_IOC_NR (cmd) &ABS_MAX ;if (copy_from_user (&abs, p, -sizeof (struct input_absinfo ))) +min (_IOC_SIZE (cmd),sizeof (struct input_absinfo ))))return -EFAULT ;/*
@@ -670,6 +672,8 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, dev->absmax[t] = abs.maximum; dev->absfuzz[t] = abs.fuzz; dev->absflat[t] = abs.flat; + dev->absres[t] = (_IOC_SIZE (cmd) <sizeof (struct input_absinfo )) ? +0 : abs.resolution;spin_unlock_irq (&dev->event_lock);
drivers/input/mouse/synaptics.c +28 -0
@@ -180,6 +180,29 @@ static int synaptics_identify(struct psmouse *psmouse)return -1 ; } +/* +* Read touchpad resolution +* Resolution is left zero if touchpad does not support the query +*/ +static int synaptics_resolution (struct psmouse *psmouse) +{ +struct synaptics_data *priv = psmouse->private; +unsigned char res[3 ]; + +if (SYN_ID_MAJOR (priv->identity) <4 ) +return 0 ; + +if (synaptics_send_cmd (psmouse,SYN_QUE_RESOLUTION , res)) +return 0 ; + +if ((res[0 ] !=0 ) && (res[1 ] &0x80 ) && (res[2 ] !=0 )) { + priv->x_res = res[0 ];/* x resolution in units/mm */ + priv->y_res = res[2 ];/* y resolution in units/mm */ + } + +return 0 ; +} +static int synaptics_query_hardware (struct psmouse *psmouse) {if (synaptics_identify (psmouse))
@@ -188,6 +211,8 @@ static int synaptics_query_hardware(struct psmouse *psmouse)return -1 ;if (synaptics_capability (psmouse))return -1 ; +if (synaptics_resolution (psmouse)) +return -1 ;return 0 ; }
@@ -563,6 +588,9 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)clear_bit (EV_REL , dev->evbit);clear_bit (REL_X , dev->relbit);clear_bit (REL_Y , dev->relbit); + + dev->absres[ABS_X ] = priv->x_res; + dev->absres[ABS_Y ] = priv->y_res; }static void synaptics_disconnect (struct psmouse *psmouse)
drivers/input/mouse/synaptics.h +2 -0
@@ -97,6 +97,8 @@ struct synaptics_data {unsigned long int capabilities;/* Capabilities */ unsigned long int ext_cap;/* Extended Capabilities */ unsigned long int identity;/* Identification */ +int x_res;/* X resolution in units/mm */ +int y_res;/* Y resolution in units/mm */ unsigned char pkt_type;/* packet type - old, new, etc */ unsigned char mode;/* current mode byte */
include/linux/input.h +2 -0
@@ -53,6 +53,7 @@ struct input_absinfo {__s32 maximum;__s32 fuzz;__s32 flat; +__s32 resolution; };#define EVIOCGVERSION _IOR('E', 0x01, int)/* get driver version */
@@ -1108,6 +1109,7 @@ struct input_dev {int absmin[ABS_MAX +1 ];int absfuzz[ABS_MAX +1 ];int absflat[ABS_MAX +1 ]; +int absres[ABS_MAX +1 ];int (*open)(struct input_dev *dev);void (*close)(struct input_dev *dev);
Signature · 1 line
1.6.0.4
PATCH 1/1 Input: synaptics - add support for reporting x/y resolution
Synaptics uses anisotropic coordinate system. On some wide touchpads vertical resolution can be twice as high as horizontal which causes unequal sensitivity on x/y directions. Add support for reading the resolution with EVIOCGABS ioctl.
---
Hi again,
I'm reposting this patch in case it got lost or buried somewhere!
-------
Here's a new version of the patch I posted last week. I've revised it according to comments from Dmitry. Please comment if I got the idea completely wrong or if there's something I could fine tune.
I had some doubts regarding my change in set_input_params() where the parameters generally seemed to be set to input_dev by calling input_set_abs_params() helper function. I did not add new resolution parameter to this function since its use was so wide spread. I just assign the resolution parameters directly which seemed more practical for me.
drivers/input/evdev.c | 8 ++++++-- drivers/input/mouse/synaptics.c | 28 ++++++++++++++++++++++++++++ drivers/input/mouse/synaptics.h | 2 ++ include/linux/input.h | 2 ++ 4 files changed, 38 insertions(+), 2 deletions(-)
drivers/input/evdev.c +6 -2
@@ -626,8 +626,10 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, abs.maximum = dev->absmax[t]; abs.fuzz = dev->absfuzz[t]; abs.flat = dev->absflat[t]; + abs.resolution = dev->absres[t]; -if (copy_to_user (p, &abs,sizeof (struct input_absinfo ))) +if (copy_to_user (p, &abs, +min (_IOC_SIZE (cmd),sizeof (struct input_absinfo ))))return -EFAULT ;return 0 ;
@@ -655,7 +657,7 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, t =_IOC_NR (cmd) &ABS_MAX ;if (copy_from_user (&abs, p, -sizeof (struct input_absinfo ))) +min (_IOC_SIZE (cmd),sizeof (struct input_absinfo ))))return -EFAULT ;/*
@@ -670,6 +672,8 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, dev->absmax[t] = abs.maximum; dev->absfuzz[t] = abs.fuzz; dev->absflat[t] = abs.flat; + dev->absres[t] = (_IOC_SIZE (cmd) <sizeof (struct input_absinfo )) ? +0 : abs.resolution;spin_unlock_irq (&dev->event_lock);
drivers/input/mouse/synaptics.c +28 -0
@@ -180,6 +180,29 @@ static int synaptics_identify(struct psmouse *psmouse)return -1 ; } +/* +* Read touchpad resolution +* Resolution is left zero if touchpad does not support the query +*/ +static int synaptics_resolution (struct psmouse *psmouse) +{ +struct synaptics_data *priv = psmouse->private; +unsigned char res[3 ]; + +if (SYN_ID_MAJOR (priv->identity) <4 ) +return 0 ; + +if (synaptics_send_cmd (psmouse,SYN_QUE_RESOLUTION , res)) +return 0 ; + +if ((res[0 ] !=0 ) && (res[1 ] &0x80 ) && (res[2 ] !=0 )) { + priv->x_res = res[0 ];/* x resolution in units/mm */ + priv->y_res = res[2 ];/* y resolution in units/mm */ + } + +return 0 ; +} +static int synaptics_query_hardware (struct psmouse *psmouse) {if (synaptics_identify (psmouse))
@@ -188,6 +211,8 @@ static int synaptics_query_hardware(struct psmouse *psmouse)return -1 ;if (synaptics_capability (psmouse))return -1 ; +if (synaptics_resolution (psmouse)) +return -1 ;return 0 ; }
@@ -563,6 +588,9 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)clear_bit (EV_REL , dev->evbit);clear_bit (REL_X , dev->relbit);clear_bit (REL_Y , dev->relbit); + + dev->absres[ABS_X ] = priv->x_res; + dev->absres[ABS_Y ] = priv->y_res; }static void synaptics_disconnect (struct psmouse *psmouse)
drivers/input/mouse/synaptics.h +2 -0
@@ -97,6 +97,8 @@ struct synaptics_data {unsigned long int capabilities;/* Capabilities */ unsigned long int ext_cap;/* Extended Capabilities */ unsigned long int identity;/* Identification */ +int x_res;/* X resolution in units/mm */ +int y_res;/* Y resolution in units/mm */ unsigned char pkt_type;/* packet type - old, new, etc */ unsigned char mode;/* current mode byte */
include/linux/input.h +2 -0
@@ -53,6 +53,7 @@ struct input_absinfo {__s32 maximum;__s32 fuzz;__s32 flat; +__s32 resolution; };#define EVIOCGVERSION _IOR('E', 0x01, int)/* get driver version */
@@ -1108,6 +1109,7 @@ struct input_dev {int absmin[ABS_MAX +1 ];int absfuzz[ABS_MAX +1 ];int absflat[ABS_MAX +1 ]; +int absres[ABS_MAX +1 ];int (*open)(struct input_dev *dev);void (*close)(struct input_dev *dev);
Signature · 1 line
1.6.0.4