* [PATCH 1/3] ethtool: Split out printing of hex data
@ 2012-05-18 14:58 Stuart Hodgson
2012-05-22 23:58 ` Ben Hutchings
0 siblings, 1 reply; 2+ messages in thread
From: Stuart Hodgson @ 2012-05-18 14:58 UTC (permalink / raw)
To: Ben Hutchings; +Cc: netdev, Yaniv Rosner, David Miller, Eilon Greenstein
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH 1/3] ethtool: Split out printing of hex data
2012-05-18 14:58 [PATCH 1/3] ethtool: Split out printing of hex data Stuart Hodgson
@ 2012-05-22 23:58 ` Ben Hutchings
0 siblings, 0 replies; 2+ messages in thread
From: Ben Hutchings @ 2012-05-22 23:58 UTC (permalink / raw)
To: Stuart Hodgson; +Cc: netdev, Yaniv Rosner, David Miller, Eilon Greenstein
On Fri, 2012-05-18 at 15:58 +0100, Stuart Hodgson wrote:
> 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]);
> + }
The problem with this (inherited from dump_regs()) is that the columns
don't line up. So I've applied this but changed dump_hex() to look more
like the code removed from dump_eeprom().
Ben.
> + 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;
> }
>
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-22 23:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-18 14:58 [PATCH 1/3] ethtool: Split out printing of hex data Stuart Hodgson
2012-05-22 23:58 ` Ben Hutchings
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).