diff options
author | Luotao Fu <luotao@alea.(none)> | 2010-02-14 20:09:19 +0100 |
---|---|---|
committer | Luotao Fu <luotao@alea.(none)> | 2010-02-14 20:09:19 +0100 |
commit | b244273e3425cf709bf85089adc6b2c235aec412 (patch) | |
tree | 85557fcc6ed7f7f600964654265340cac617f947 | |
parent | 5d0b73e302958da34f9b7a369f4b02d673173d3a (diff) | |
download | canutils-b244273e3425cf709bf85089adc6b2c235aec412.tar.gz canutils-b244273e3425cf709bf85089adc6b2c235aec412.tar.xz |
[canconfig] rerange code
Signed-off-by: Luotao Fu <luotao@alea.(none)>
-rw-r--r-- | src/canconfig.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/canconfig.c b/src/canconfig.c index 47e8f80..90fbb91 100644 --- a/src/canconfig.c +++ b/src/canconfig.c @@ -226,6 +226,22 @@ static void do_show_bittiming(const char *name) bt.sjw, bt.brp); } +static void cmd_bittiming(int argc, char *argv[], const char *name) +{ + int show_only = 1; + + if (argc > 0) + show_only = find_str(config_keywords, + sizeof(config_keywords) / sizeof(char*), + argv[1]); + + if (! show_only) + do_set_bittiming(argc, argv, name); + + do_show_bittiming(name); + do_show_bitrate(name); +} + static void do_show_bittiming_const(const char *name) { struct can_bittiming_const btc; @@ -243,20 +259,9 @@ static void do_show_bittiming_const(const char *name) btc.brp_min, btc.brp_max, btc.brp_inc); } -static void cmd_bittiming(int argc, char *argv[], const char *name) +static void cmd_bittiming_const(int argc, char *argv[], const char *name) { - int show_only = 1; - - if (argc > 0) - show_only = find_str(config_keywords, - sizeof(config_keywords) / sizeof(char*), - argv[1]); - - if (! show_only) - do_set_bittiming(argc, argv, name); - - do_show_bittiming(name); - do_show_bitrate(name); + do_show_bittiming_const(name); } static void do_show_state(const char *name) @@ -283,7 +288,7 @@ static void do_show_clockfreq(const char *name) { struct can_clock clock; - memset(&clock, 0, sizeof(clock)); + memset(&clock, 0, sizeof(struct can_clock)); if (can_get_clock(name, &clock) < 0) { fprintf(stderr, "%s: failed to get clock parameters\n", name); @@ -298,11 +303,6 @@ static void cmd_clockfreq(int argc, char *argv[], const char *name) do_show_clockfreq(name); } -static void cmd_bittiming_const(int argc, char *argv[], const char *name) -{ - do_show_bittiming_const(name); -} - static void do_restart(const char *name) { if (can_do_restart(name) < 0) { |