linux-kernel - [PATCH 09/22 v4] Input: atmel_mxt_ts - print all instances when dumping objects

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1339992522-22073-10-git-send-email-djkurtz@chromium.org>
Date:	Mon, 18 Jun 2012 12:08:29 +0800
From:	Daniel Kurtz <djkurtz@...omium.org>
To:	Dmitry Torokhov <dmitry.torokhov@...il.com>,
	Henrik Rydberg <rydberg@...omail.se>,
	Joonyoung Shim <jy0922.shim@...sung.com>,
	Nick Dyer <nick.dyer@...ev.co.uk>, linux-input@...r.kernel.org
Cc:	Iiro Valkonen <iiro.valkonen@...el.com>,
	Benson Leung <bleung@...omium.org>,
	Yufeng Shen <miletus@...omium.org>,
	Olof Johansson <olofj@...omium.org>,
	linux-kernel@...r.kernel.org, Daniel Kurtz <djkurtz@...omium.org>
Subject: [PATCH 09/22 v4] Input: atmel_mxt_ts - print all instances when dumping objects

For objects with multiple instances, dump them all, prepending each with
its "Instance #".

Signed-off-by: Daniel Kurtz <djkurtz@...omium.org>
---
 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 65fd89b..281fcbd 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -882,7 +882,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;
@@ -902,18 +902,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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/