From: Stuart Hodgson <smhodgson@solarflare.com>
To: Ben Hutchings <bhutchings@solarflare.com>
Cc: <netdev@vger.kernel.org>, Yaniv Rosner <yanivr@broadcom.com>,
David Miller <davem@davemloft.net>,
Eilon Greenstein <eilong@broadcom.com>
Subject: [PATCH 1/3] ethtool: Split out printing of hex data
Date: Fri, 18 May 2012 15:58:24 +0100 [thread overview]
Message-ID: <4FB66390.2010704@solarflare.com> (raw)
Split out printing of hex data to common function from
dump_regs and dump_eeprom. Ready for use by module
eeprom dumping.
Signed-off-by: Stuart Hodgson <smhodgson@solarflare.com>
---
ethtool.c | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/ethtool.c b/ethtool.c
index e80b38b..fdc21de 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -787,6 +787,20 @@ static const struct {
{ "st_gmac", st_gmac_dump_regs },
};
+static void dump_hex(__u8 *data, int len, int offset)
+{
+ int i;
+
+ fprintf(stdout, "Offset\tValues\n");
+ fprintf(stdout, "--------\t-----");
+ for (i = 0; i < len; i++) {
+ if (i%16 == 0)
+ fprintf(stdout, "\n0x%04x:\t", i + offset);
+ fprintf(stdout, " %02x", data[i]);
+ }
+ fprintf(stdout, "\n\n");
+}
+
static int dump_regs(int gregs_dump_raw, int gregs_dump_hex,
const char *gregs_dump_file,
struct ethtool_drvinfo *info, struct ethtool_regs *regs)
@@ -820,22 +834,14 @@ static int dump_regs(int gregs_dump_raw, int gregs_dump_hex,
ETHTOOL_BUSINFO_LEN))
return driver_list[i].func(info, regs);
- fprintf(stdout, "Offset\tValues\n");
- fprintf(stdout, "--------\t-----");
- for (i = 0; i < regs->len; i++) {
- if (i%16 == 0)
- fprintf(stdout, "\n%03x:\t", i);
- fprintf(stdout, " %02x", regs->data[i]);
- }
- fprintf(stdout, "\n\n");
+ dump_hex(regs->data, regs->len, 0);
+
return 0;
}
static int dump_eeprom(int geeprom_dump_raw, struct ethtool_drvinfo *info,
struct ethtool_eeprom *ee)
{
- int i;
-
if (geeprom_dump_raw) {
fwrite(ee->data, 1, ee->len, stdout);
return 0;
@@ -847,13 +853,8 @@ static int dump_eeprom(int geeprom_dump_raw, struct ethtool_drvinfo *info,
return tg3_dump_eeprom(info, ee);
}
- fprintf(stdout, "Offset\t\tValues\n");
- fprintf(stdout, "------\t\t------");
- for (i = 0; i < ee->len; i++) {
- if(!(i%16)) fprintf(stdout, "\n0x%04x\t\t", i + ee->offset);
- fprintf(stdout, "%02x ", ee->data[i]);
- }
- fprintf(stdout, "\n");
+ dump_hex(ee->data, ee->len, ee->offset);
+
return 0;
}
--
1.7.7.6
next reply other threads:[~2012-05-18 14:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-18 14:58 Stuart Hodgson [this message]
2012-05-22 23:58 ` [PATCH 1/3] ethtool: Split out printing of hex data Ben Hutchings
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FB66390.2010704@solarflare.com \
--to=smhodgson@solarflare.com \
--cc=bhutchings@solarflare.com \
--cc=davem@davemloft.net \
--cc=eilong@broadcom.com \
--cc=netdev@vger.kernel.org \
--cc=yanivr@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).