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

Merge pull request #387 from marckleinebudde/can-calc-bit-timing 

can-calc-bit-timing: fix various compiler warnings
pull/388/head
Marc Kleine-Budde 2022-12-07 15:22:51 +01:00 committed by GitHub
parent 9177294093 0b3112edf2
commit a18337b102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
calc-bit-timing/can-calc-bit-timing.c
View File

@ -136,8 +136,8 @@ struct calc_bittiming_const {
const struct calc_ref_clk ref_clk[16]; const struct calc_ref_clk ref_clk[16];
const void (*printf_btr)(struct can_bittiming *bt, bool hdr); void (*printf_btr)(struct can_bittiming *bt, bool hdr);
const void (*printf_data_btr)(struct can_bittiming *bt, bool hdr); void (*printf_data_btr)(struct can_bittiming *bt, bool hdr);
}; };
struct alg { struct alg {
@ -159,7 +159,7 @@ struct alg {
struct calc_data { struct calc_data {
const struct can_bittiming_const *bittiming_const; const struct can_bittiming_const *bittiming_const;
const struct alg *alg; const struct alg *alg;
const void (*printf_btr)(struct can_bittiming *bt, bool hdr); void (*printf_btr)(struct can_bittiming *bt, bool hdr);
const char *name; const char *name;
const struct calc_ref_clk *ref_clks; const struct calc_ref_clk *ref_clks;
@ -1187,6 +1187,9 @@ static const unsigned int common_data_bitrates[] = {
#define CAN_KBPS 1000 #define CAN_KBPS 1000
#define KILO 1000UL #define KILO 1000UL
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsign-compare"
#define can_update_spt can_update_spt_v2_6_31 #define can_update_spt can_update_spt_v2_6_31
#define can_calc_bittiming can_calc_bittiming_v2_6_31 #define can_calc_bittiming can_calc_bittiming_v2_6_31
#define can_fixup_bittiming can_fixup_bittiming_v2_6_31 #define can_fixup_bittiming can_fixup_bittiming_v2_6_31
@ -1211,6 +1214,8 @@ static const unsigned int common_data_bitrates[] = {
#undef can_calc_bittiming #undef can_calc_bittiming
#undef can_fixup_bittiming #undef can_fixup_bittiming
#pragma GCC diagnostic pop
#define can_update_sample_point can_update_sample_point_v5_16 #define can_update_sample_point can_update_sample_point_v5_16
#define can_calc_bittiming can_calc_bittiming_v5_16 #define can_calc_bittiming can_calc_bittiming_v5_16
#define can_fixup_bittiming can_fixup_bittiming_v5_16 #define can_fixup_bittiming can_fixup_bittiming_v5_16