sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

can-calc-bit-timing: add information if printing data bit timing table 

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
pull/372/head
Marc Kleine-Budde 2022-03-18 14:38:59 +01:00
parent ab2b11d9a8
commit 258f357814
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
can-calc-bit-timing.c
View File

@ -163,6 +163,7 @@ struct calc_data {
const struct can_bittiming *opt_bt; const struct can_bittiming *opt_bt;
bool quiet; bool quiet;
bool fd_mode;
}; };
static inline void *netdev_priv(const struct net_device *dev) static inline void *netdev_priv(const struct net_device *dev)
@ -1543,7 +1544,8 @@ static void print_bittiming_one(const struct can_calc_bittiming *calc_bittiming,
unsigned int bitrate_nominal, unsigned int bitrate_nominal,
unsigned int sample_point_nominal, unsigned int sample_point_nominal,
void (*printf_btr)(struct can_bittiming *bt, bool hdr), void (*printf_btr)(struct can_bittiming *bt, bool hdr),
bool quiet) bool quiet,
bool fd_mode)
{ {
struct net_device dev = { struct net_device dev = {
.priv.clock.freq = ref_clk->clk, .priv.clock.freq = ref_clk->clk,
@ -1555,9 +1557,10 @@ static void print_bittiming_one(const struct can_calc_bittiming *calc_bittiming,
unsigned int bitrate_error, sample_point_error; unsigned int bitrate_error, sample_point_error;
if (!quiet) { if (!quiet) {
printf("Bit timing parameters for %s with %.6f MHz ref clock %s%s%susing algo '%s'\n" printf("%sBit timing parameters for %s with %.6f MHz ref clock %s%s%susing algo '%s'\n"
" nominal real Bitrt nom real SampP\n" " nominal real Bitrt nom real SampP\n"
" Bitrate TQ[ns] PrS PhS1 PhS2 SJW BRP Bitrate Error SampP SampP Error ", " Bitrate TQ[ns] PrS PhS1 PhS2 SJW BRP Bitrate Error SampP SampP Error ",
fd_mode ? "Data " : "",
bittiming_const->name, bittiming_const->name,
ref_clk->clk / 1000000.0, ref_clk->clk / 1000000.0,
ref_clk->name ? "(" : "", ref_clk->name ? "(" : "",
@ -1649,7 +1652,8 @@ static void print_bittiming(const struct calc_data *data)
*bitrates, *bitrates,
sample_point, sample_point,
printf_btr, printf_btr,
quiet); quiet,
data->fd_mode);
bitrates++; bitrates++;
quiet = true; quiet = true;
} }
@ -1706,6 +1710,8 @@ static void do_calc(struct calc_data *data)
else else
data->bitrates = common_bitrates; data->bitrates = common_bitrates;
data->fd_mode = false;
print_bittiming(data); print_bittiming(data);
} }
@ -1729,6 +1735,8 @@ static void do_calc(struct calc_data *data)
else else
data->bitrates = common_data_bitrates; data->bitrates = common_data_bitrates;
data->fd_mode = true;
print_bittiming(data); print_bittiming(data);
} }
} }