Hi Daniel
> The normal messages sent after boot or NVRAM update are T6 reports,
> containing a status, and the config memory checksum. Parse them and dump
> a useful info message.
>
> This patch tested on an MXT224E.
>
> Signed-off-by: Daniel Kurtz <djkurtz@xxxxxxxxxxxx>
> ---
> drivers/input/touchscreen/atmel_mxt_ts.c | 21 ++++++++++++++-------
> 1 files changed, 14 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
> index f9a9be9..8350bcc 100644
> --- a/drivers/input/touchscreen/atmel_mxt_ts.c
> +++ b/drivers/input/touchscreen/atmel_mxt_ts.c
> @@ -248,6 +248,7 @@ struct mxt_data {
> unsigned int max_y;
>
> /* Cached parameters from object table */
> + u8 T6_reportid;
> u8 T9_reportid_min;
> u8 T9_reportid_max;
> };
> @@ -555,8 +556,6 @@ static irqreturn_t mxt_interrupt(int irq, void *dev_id)
> struct device *dev = &data->client->dev;
> int id;
> u8 reportid;
> - u8 max_reportid;
> - u8 min_reportid;
> bool update_input = false;
>
> do {
> @@ -567,11 +566,15 @@ static irqreturn_t mxt_interrupt(int irq, void *dev_id)
>
> reportid = message.reportid;
>
> - max_reportid = data->T9_reportid_max;
> - min_reportid = data->T9_reportid_min;
> - id = reportid - min_reportid;
> -
> - if (reportid >= min_reportid && reportid <= max_reportid) {
> + if (reportid == data->T6_reportid) {
> + unsigned csum = message.message[1] |
> + (message.message[2] << 8) |
> + (message.message[3] << 16);
> + dev_dbg(dev, "Status: %02x Config Checksum: %06x\n",
> + message.message[0], csum);
The formatting here may pass checkpatch, but it is really ugly. When
the patches start to require a lot of line breaks, and this series
contains quite a few, then please break out new functions.
> + } else if (reportid >= data->T9_reportid_min &&
> + reportid <= data->T9_reportid_max) {
> + id = reportid - data->T9_reportid_min;
> mxt_input_touchevent(data, &message, id);
> update_input = true;
> } else {
> @@ -749,6 +752,9 @@ static int mxt_get_object_table(struct mxt_data *data)
> object->instances + 1, min_id, max_id);
>
> switch (object->type) {
> + case MXT_GEN_COMMAND_T6:
> + data->T6_reportid = min_id;
> + break;
> case MXT_TOUCH_MULTI_T9:
> data->T9_reportid_min = min_id;
> data->T9_reportid_max = max_id;
> @@ -1008,6 +1014,7 @@ static ssize_t mxt_update_fw_store(struct device *dev,
> /* Destroy old object table and any cached fields */
> kfree(data->object_table);
> data->object_table = NULL;
> + data->T6_reportid = 0;
> data->T9_reportid_min = 0;
> data->T9_reportid_max = 0;
This bunch of lines, for instance, would fit perfectly in a
mxt_destroy() function, which would also make the comment superfluous.
>
> --
> 1.7.7.3
>
Thanks.
Henrik
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
