[Intel-gfx] [PATCH igt 2/3] toos/intel_iosf_sb: Add symbolic unit names

[ville.syrjala at linux.intel.com]

From: Ville Syrjälä <ville.syrjala at linux.intel.com>

Add a bunc of symbolic sideband unit names so that you don't have to go
trawling through the sideband HAS every time you want to poke at
something with the tool. You can still specify the port manually though
if you know them by heart already.

Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
---
 tools/intel_iosf_sb_read.c  | 24 ++++++++++++++++++++++--
 tools/intel_iosf_sb_write.c | 26 +++++++++++++++++++++++---
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/tools/intel_iosf_sb_read.c b/tools/intel_iosf_sb_read.c
index f7ff64a..8f35e50 100644
--- a/tools/intel_iosf_sb_read.c
+++ b/tools/intel_iosf_sb_read.c
@@ -48,13 +48,33 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-	port = strtoul(argv[1], NULL, 16);
+	if (!strcasecmp(argv[1], "bunit"))
+		port = 0x03;
+	else if (!strcasecmp(argv[1], "punit"))
+		port = 0x04;
+	else if (!strcasecmp(argv[1], "nc"))
+		port = 0x11;
+	else if (!strcasecmp(argv[1], "dpio"))
+		port = 0x13;
+	else if (!strcasecmp(argv[1], "gpio_nc"))
+		port = 0x13;
+	else if (!strcasecmp(argv[1], "cck"))
+		port = 0x14;
+	else if (!strcasecmp(argv[1], "ccu"))
+		port = 0xa9;
+	else if (!strcasecmp(argv[1], "dpio2"))
+		port = 0x1a;
+	else if (!strcasecmp(argv[1], "flisdsi"))
+		port = 0x1b;
+	else
+		port = strtoul(argv[1], NULL, 16);
+
 	reg = strtoul(argv[2], NULL, 16);
 
 	intel_register_access_init(dev, 0);
 
 	val = intel_iosf_sb_read(port, reg);
-	printf("0x%02x/0x%04x : 0x%08x\n", port, reg, val);
+	printf("0x%02x(%s)/0x%04x : 0x%08x\n", port, argv[1], reg, val);
 
 	intel_register_access_fini();
 
diff --git a/tools/intel_iosf_sb_write.c b/tools/intel_iosf_sb_write.c
index 251b660..8d06380 100644
--- a/tools/intel_iosf_sb_write.c
+++ b/tools/intel_iosf_sb_write.c
@@ -47,19 +47,39 @@ int main(int argc, char** argv)
 		return 1;
 	}
 
-	port = strtoul(argv[1], NULL, 16);
+	if (!strcasecmp(argv[1], "bunit"))
+		port = 0x03;
+	else if (!strcasecmp(argv[1], "punit"))
+		port = 0x04;
+	else if (!strcasecmp(argv[1], "nc"))
+		port = 0x11;
+	else if (!strcasecmp(argv[1], "dpio"))
+		port = 0x13;
+	else if (!strcasecmp(argv[1], "gpio_nc"))
+		port = 0x13;
+	else if (!strcasecmp(argv[1], "cck"))
+		port = 0x14;
+	else if (!strcasecmp(argv[1], "ccu"))
+		port = 0xa9;
+	else if (!strcasecmp(argv[1], "dpio2"))
+		port = 0x1a;
+	else if (!strcasecmp(argv[1], "flisdsi"))
+		port = 0x1b;
+	else
+		port = strtoul(argv[1], NULL, 16);
+
 	reg = strtoul(argv[2], NULL, 16);
 	val = strtoul(argv[3], NULL, 16);
 
 	intel_register_access_init(dev, 0);
 
 	tmp = intel_iosf_sb_read(port, reg);
-	printf("Value before: 0x%X\n", tmp);
+	printf("0x%02x(%s)/0x%04x before : 0x%08x\n", port, argv[1], reg, tmp);
 
 	intel_iosf_sb_write(port, reg, val);
 
 	tmp = intel_iosf_sb_read(port, reg);
-	printf("Value after: 0x%X\n", tmp);
+	printf("0x%02x(%s)/0x%04x after  : 0x%08x\n", port, argv[1], reg, tmp);
 
 	intel_register_access_fini();
 
-- 
1.8.5.5