From: Eugeni Dodonov Subject: [PATCH 1/3] intel_reg_read: add support for getopt Date: Tue, 28 Feb 2012 17:55:39 -0300 Message-ID: <1330462541-1375-1-git-send-email-eugeni.dodonov@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from oproxy3-pub.bluehost.com (oproxy3-pub.bluehost.com [69.89.21.8]) by gabe.freedesktop.org (Postfix) with SMTP id A06C59EB22 for ; Tue, 28 Feb 2012 12:55:52 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Eugeni Dodonov List-Id: intel-gfx@lists.freedesktop.org This will allow us to pass more options to it in the future. Signed-off-by: Eugeni Dodonov --- tools/intel_reg_read.c | 44 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/tools/intel_reg_read.c b/tools/intel_reg_read.c index cad30ff..c3e559b 100644 --- a/tools/intel_reg_read.c +++ b/tools/intel_reg_read.c @@ -41,21 +41,45 @@ static void dump_range(uint32_t start, uint32_t end) *(volatile uint32_t *)((volatile char*)mmio + i)); } +static void usage(char *cmdname) +{ + printf("Usage: %s [-f | addr]\n", cmdname); + printf("\t -f : read back full range of registers.\n"); + printf("\t WARNING! This could be danger to hang the machine!\n"); + printf("\t addr : in 0xXXXX format\n"); +} + int main(int argc, char** argv) { + int ret=0; uint32_t reg; + int ch; + char *cmdname = strdup(argv[0]); + int full_dump=0; + + while ((ch = getopt(argc, argv, "fh")) != -1) { + switch(ch) { + case 'f': + full_dump=1; + break; + case 'h': + usage(cmdname); + ret=1; + goto out; + } + } + argc -= optind; + argv += optind; - if (argc != 2) { - printf("Usage: %s [-f | addr]\n", argv[0]); - printf("\t -f : read back full range of registers.\n"); - printf("\t WARNING! This could be danger to hang the machine!\n"); - printf("\t addr : in 0xXXXX format\n"); - exit(1); + if (argc != 1) { + usage(cmdname); + ret=1; + goto out; } intel_register_access_init(intel_get_pci_device(), 0); - if (!strcmp(argv[1], "-f")) { + if (full_dump) { dump_range(0x00000, 0x00fff); /* VGA registers */ dump_range(0x02000, 0x02fff); /* instruction, memory, interrupt control registers */ dump_range(0x03000, 0x031ff); /* FENCE and PPGTT control registers */ @@ -71,12 +95,14 @@ int main(int argc, char** argv) dump_range(0x70000, 0x72fff); /* display and cursor registers */ dump_range(0x73000, 0x73fff); /* performance counters */ } else { - sscanf(argv[1], "0x%x", ®); + sscanf(argv[0], "0x%x", ®); dump_range(reg, reg + 4); } intel_register_access_fini(); - return 0; +out: + free(cmdname); + return ret; } -- 1.7.9.2