[PATCH 09/21 v5] Input: atmel_mxt_ts - print all instances when dumping objects
From: Daniel Kurtz <hidden>
Date: 2012-06-26 06:59:29
Also in:
lkml
Subsystem:
atmel maxtouch driver, input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers:
Nick Dyer, Dmitry Torokhov, Linus Torvalds
For objects with multiple instances, dump them all, prepending each with its "Instance #". Signed-off-by: Daniel Kurtz <redacted> --- drivers/input/touchscreen/atmel_mxt_ts.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index c8cfd7b..25d3dd5 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c@@ -883,7 +883,7 @@ static ssize_t mxt_object_show(struct device *dev, struct mxt_data *data = dev_get_drvdata(dev); struct mxt_object *object; int count = 0; - int i, j; + int i, j, k; int error; u8 val; u8 *obuf;
@@ -903,18 +903,30 @@ static ssize_t mxt_object_show(struct device *dev, count += scnprintf(buf + count, PAGE_SIZE - count, "T%u:\n", object->type); - error = __mxt_read_reg(data->client, object->start_address, - object->size + 1, obuf); - if (error) - break; + for (j = 0; j < object->instances + 1; j++) { + u16 size = object->size + 1; + u16 addr = object->start_address + j * size; + + error = __mxt_read_reg(data->client, addr, size, obuf); + if (error) + break; - for (j = 0; j < object->size + 1; j++) { - val = obuf[j]; + if (object->instances > 0) + count += scnprintf(buf + count, + PAGE_SIZE - count, + "Instance %u\n", j); + for (k = 0; k < object->size + 1; k++) { + val = obuf[k]; + + count += scnprintf(buf + count, + PAGE_SIZE - count, + "\t[%2u]: %02x (%d)\n", + k, val, val); + } count += scnprintf(buf + count, PAGE_SIZE - count, - "\t[%2d]: %02x (%d)\n", j, val, val); + "\n"); } - count += scnprintf(buf + count, PAGE_SIZE - count, "\n"); } kfree(obuf);
--
1.7.7.3