| Message ID | 1313420550-5885-1-git-send-email-miletus@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/15/2011 11:02 PM, Yufeng Shen wrote: > Atmel mxt1386 touch controller has the touch pressure information but > the current driver atmel_mxt_ts does not expose it to the user space. > This patch makes the driver report the touch pressure information to > user space. > > ChangeLog: > v2: fixed indentation as commented by Wanlong Gao > v3: added signed-off-by > > Change-Id: Ie0e4683a3cd5ec79222f7682b0ddc24f909af543 > Signed-off-by: Yufeng Shen<miletus@chromium.org> Acked-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> > --- > drivers/input/touchscreen/atmel_mxt_ts.c | 8 ++++++++ > 1 files changed, 8 insertions(+), 0 deletions(-) > > diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c > index ae00604..9bdf4e0 100644 > --- a/drivers/input/touchscreen/atmel_mxt_ts.c > +++ b/drivers/input/touchscreen/atmel_mxt_ts.c > @@ -244,6 +244,7 @@ struct mxt_finger { > int x; > int y; > int area; > + int pressure; > }; > > /* Each client has this additional data */ > @@ -536,6 +537,8 @@ static void mxt_input_report(struct mxt_data *data, int single_id) > finger[id].x); > input_report_abs(input_dev, ABS_MT_POSITION_Y, > finger[id].y); > + input_report_abs(input_dev, ABS_MT_PRESSURE, > + finger[id].pressure); > } else { > finger[id].status = 0; > } > @@ -560,6 +563,7 @@ static void mxt_input_touchevent(struct mxt_data *data, > int x; > int y; > int area; > + int pressure; > > /* Check the touch is present on the screen */ > if (!(status& MXT_DETECT)) { > @@ -584,6 +588,7 @@ static void mxt_input_touchevent(struct mxt_data *data, > y = y>> 2; > > area = message->message[4]; > + pressure = message->message[5]; > > dev_dbg(dev, "[%d] %s x: %d, y: %d, area: %d\n", id, > status& MXT_MOVE ? "moved" : "pressed", > @@ -594,6 +599,7 @@ static void mxt_input_touchevent(struct mxt_data *data, > finger[id].x = x; > finger[id].y = y; > finger[id].area = area; > + finger[id].pressure = pressure; > > mxt_input_report(data, id); > } > @@ -1125,6 +1131,8 @@ static int __devinit mxt_probe(struct i2c_client *client, > 0, data->max_x, 0, 0); > input_set_abs_params(input_dev, ABS_MT_POSITION_Y, > 0, data->max_y, 0, 0); > + input_set_abs_params(input_dev, ABS_MT_PRESSURE, > + 0, 255, 0, 0); > > input_set_drvdata(input_dev, data); > i2c_set_clientdata(client, data);
On Mon, Aug 15, 2011 at 11:02:30AM -0400, Yufeng Shen wrote: > Atmel mxt1386 touch controller has the touch pressure information but > the current driver atmel_mxt_ts does not expose it to the user space. > This patch makes the driver report the touch pressure information to > user space. > > ChangeLog: > v2: fixed indentation as commented by Wanlong Gao > v3: added signed-off-by > > Change-Id: Ie0e4683a3cd5ec79222f7682b0ddc24f909af543 > Signed-off-by: Yufeng Shen <miletus@chromium.org> > --- > drivers/input/touchscreen/atmel_mxt_ts.c | 8 ++++++++ > 1 files changed, 8 insertions(+), 0 deletions(-) > > diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c > index ae00604..9bdf4e0 100644 > --- a/drivers/input/touchscreen/atmel_mxt_ts.c > +++ b/drivers/input/touchscreen/atmel_mxt_ts.c > @@ -244,6 +244,7 @@ struct mxt_finger { > int x; > int y; > int area; > + int pressure; > }; > > /* Each client has this additional data */ > @@ -536,6 +537,8 @@ static void mxt_input_report(struct mxt_data *data, int single_id) > finger[id].x); > input_report_abs(input_dev, ABS_MT_POSITION_Y, > finger[id].y); > + input_report_abs(input_dev, ABS_MT_PRESSURE, > + finger[id].pressure); > } else { > finger[id].status = 0; > } > @@ -560,6 +563,7 @@ static void mxt_input_touchevent(struct mxt_data *data, > int x; > int y; > int area; > + int pressure; > > /* Check the touch is present on the screen */ > if (!(status & MXT_DETECT)) { > @@ -584,6 +588,7 @@ static void mxt_input_touchevent(struct mxt_data *data, > y = y >> 2; > > area = message->message[4]; > + pressure = message->message[5]; > > dev_dbg(dev, "[%d] %s x: %d, y: %d, area: %d\n", id, > status & MXT_MOVE ? "moved" : "pressed", > @@ -594,6 +599,7 @@ static void mxt_input_touchevent(struct mxt_data *data, > finger[id].x = x; > finger[id].y = y; > finger[id].area = area; > + finger[id].pressure = pressure; > > mxt_input_report(data, id); > } > @@ -1125,6 +1131,8 @@ static int __devinit mxt_probe(struct i2c_client *client, > 0, data->max_x, 0, 0); > input_set_abs_params(input_dev, ABS_MT_POSITION_Y, > 0, data->max_y, 0, 0); > + input_set_abs_params(input_dev, ABS_MT_PRESSURE, > + 0, 255, 0, 0); > > input_set_drvdata(input_dev, data); > i2c_set_clientdata(client, data); > -- > 1.7.3.1 > Acked-by: Henrik Rydberg <rydberg@euromail.se> Thanks, Henrik -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index ae00604..9bdf4e0 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -244,6 +244,7 @@ struct mxt_finger { int x; int y; int area; + int pressure; }; /* Each client has this additional data */ @@ -536,6 +537,8 @@ static void mxt_input_report(struct mxt_data *data, int single_id) finger[id].x); input_report_abs(input_dev, ABS_MT_POSITION_Y, finger[id].y); + input_report_abs(input_dev, ABS_MT_PRESSURE, + finger[id].pressure); } else { finger[id].status = 0; } @@ -560,6 +563,7 @@ static void mxt_input_touchevent(struct mxt_data *data, int x; int y; int area; + int pressure; /* Check the touch is present on the screen */ if (!(status & MXT_DETECT)) { @@ -584,6 +588,7 @@ static void mxt_input_touchevent(struct mxt_data *data, y = y >> 2; area = message->message[4]; + pressure = message->message[5]; dev_dbg(dev, "[%d] %s x: %d, y: %d, area: %d\n", id, status & MXT_MOVE ? "moved" : "pressed", @@ -594,6 +599,7 @@ static void mxt_input_touchevent(struct mxt_data *data, finger[id].x = x; finger[id].y = y; finger[id].area = area; + finger[id].pressure = pressure; mxt_input_report(data, id); } @@ -1125,6 +1131,8 @@ static int __devinit mxt_probe(struct i2c_client *client, 0, data->max_x, 0, 0); input_set_abs_params(input_dev, ABS_MT_POSITION_Y, 0, data->max_y, 0, 0); + input_set_abs_params(input_dev, ABS_MT_PRESSURE, + 0, 255, 0, 0); input_set_drvdata(input_dev, data); i2c_set_clientdata(client, data);
Atmel mxt1386 touch controller has the touch pressure information but the current driver atmel_mxt_ts does not expose it to the user space. This patch makes the driver report the touch pressure information to user space. ChangeLog: v2: fixed indentation as commented by Wanlong Gao v3: added signed-off-by Change-Id: Ie0e4683a3cd5ec79222f7682b0ddc24f909af543 Signed-off-by: Yufeng Shen <miletus@chromium.org> --- drivers/input/touchscreen/atmel_mxt_ts.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)