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 nop printf_btr 

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
pull/333/head
Marc Kleine-Budde 2019-05-09 11:04:36 +02:00
parent 7ec433f6a6
commit 2829512f9b
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,6 +183,10 @@ static void print_usage(char *cmd)
cmd); cmd);
} }
static void printf_btr_nop(struct can_bittiming *bt, bool hdr)
{
}
static void printf_btr_sja1000(struct can_bittiming *bt, bool hdr) static void printf_btr_sja1000(struct can_bittiming *bt, bool hdr)
{ {
uint8_t btr0, btr1; uint8_t btr0, btr1;
@ -791,7 +795,6 @@ static void print_bittiming_one(const struct can_bittiming_const *bittiming_cons
ref_clk->name ? ")" : "", ref_clk->name ? ")" : "",
ref_clk->clk / 1000000.0); ref_clk->clk / 1000000.0);
if (printf_btr)
printf_btr(&bt, true); printf_btr(&bt, true);
printf("\n"); printf("\n");
} }
@ -838,7 +841,6 @@ static void print_bittiming_one(const struct can_bittiming_const *bittiming_cons
printf("%4.1f%% ", /* Sample Point Error */ printf("%4.1f%% ", /* Sample Point Error */
100.0 * sample_point_error / sample_point_nominal); 100.0 * sample_point_error / sample_point_nominal);
if (printf_btr)
printf_btr(&bt, false); printf_btr(&bt, false);
printf("\n"); printf("\n");
} }
@ -848,9 +850,15 @@ static void print_bittiming(const struct calc_data *data)
const struct calc_ref_clk *ref_clks = data->ref_clks; const struct calc_ref_clk *ref_clks = data->ref_clks;
while (ref_clks->clk) { while (ref_clks->clk) {
void (*printf_btr)(struct can_bittiming *bt, bool hdr);
unsigned int const *bitrates = data->bitrates; unsigned int const *bitrates = data->bitrates;
bool quiet = data->quiet; bool quiet = data->quiet;
if (data->printf_btr)
printf_btr = data->printf_btr;
else
printf_btr = printf_btr_nop;
while (*bitrates) { while (*bitrates) {
unsigned int sample_point; unsigned int sample_point;
@ -865,7 +873,7 @@ static void print_bittiming(const struct calc_data *data)
ref_clks, ref_clks,
*bitrates, *bitrates,
sample_point, sample_point,
data->printf_btr, printf_btr,
quiet); quiet);
bitrates++; bitrates++;
quiet = true; quiet = true;