Skip to content

M
Mock Turtle
Commit 086c5071 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

test: style fix 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent e2487f88
Show whitespace changes
Inline Side-by-side
Showing with 137 additions and 114 deletions
list/test/list-boot.c
View file @ 086c5071
...@@ -4,15 +4,17 @@ ...@@ -4,15 +4,17 @@
void list_boot_node(struct list_node *dev); void list_boot_node(struct list_node *dev);
main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int lun;
if(argc < 2) if(argc < 2)
{ {
printf("usage: %s <lun>\n", argv[0]); printf("usage: %s <lun>\n", argv[0]);
return 0; return 0;
} }
int lun = atoi(argv[1]); lun = atoi(argv[1]);
printf("Booting LIST Node @ Lun %d\n", lun); printf("Booting LIST Node @ Lun %d\n", lun);
...@@ -28,5 +30,4 @@ main(int argc, char *argv[]) ...@@ -28,5 +30,4 @@ main(int argc, char *argv[])
sleep(2); sleep(2);
return 0; return 0;
} }
list/test/list-dbg.c
View file @ 086c5071
...@@ -4,17 +4,20 @@ ...@@ -4,17 +4,20 @@
void list_boot_node(struct list_node *dev); void list_boot_node(struct list_node *dev);
main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct list_node *dev;
int lun;
if(argc < 2) if(argc < 2)
{ {
printf("usage: %s <lun>\n", argv[0]); printf("usage: %s <lun>\n", argv[0]);
return 0; return 0;
} }
int lun = atoi(argv[1]); lun = atoi(argv[1]);
struct list_node *dev = list_open_node_by_lun(lun); dev = list_open_node_by_lun(lun);
sleep(20000); sleep(20000);
......
list/test/list-input-test.c
View file @ 086c5071
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
void decode_flags(char *buf, uint32_t flags) void decode_flags(char *buf, uint32_t flags)
{ {
int l;
strcpy(buf,""); strcpy(buf,"");
if( flags & LIST_ENABLED ) if( flags & LIST_ENABLED )
...@@ -21,7 +22,7 @@ void decode_flags(char *buf, uint32_t flags) ...@@ -21,7 +22,7 @@ void decode_flags(char *buf, uint32_t flags)
if( flags & LIST_TRIGGERED ) if( flags & LIST_TRIGGERED )
strcat(buf, "Triggered "); strcat(buf, "Triggered ");
int l = strlen(buf); l = strlen(buf);
if(l) if(l)
buf[l-1] = 0; buf[l-1] = 0;
} }
...@@ -130,7 +131,6 @@ void dump_input_state ( struct list_input_state *state ) ...@@ -130,7 +131,6 @@ void dump_input_state ( struct list_input_state *state )
format_ts( tmp, state->last_sent.ts, 1 ); format_ts( tmp, state->last_sent.ts, 1 );
format_id( tmp2, state->last_sent.id ); format_id( tmp2, state->last_sent.id );
printf(" - Last sent trigger: %s, ID: %s, SeqNo %d\n", tmp, tmp2, state->last_sent.seq); printf(" - Last sent trigger: %s, ID: %s, SeqNo %d\n", tmp, tmp2, state->last_sent.seq);
} }
printf(" - Dead time: %d ns\n", ts_to_picos( state->dead_time ) / 1000 ); printf(" - Dead time: %d ns\n", ts_to_picos( state->dead_time ) / 1000 );
...@@ -147,11 +147,15 @@ int parse_trigger_id(const char *str, struct list_id *id) ...@@ -147,11 +147,15 @@ int parse_trigger_id(const char *str, struct list_id *id)
int parse_delay (char *dly, uint64_t *delay_ps) int parse_delay (char *dly, uint64_t *delay_ps)
{ {
int l = strlen(dly); int l = strlen(dly);
char last;
uint64_t mult;
double d;
if(!l) if(!l)
return -1; return -1;
char last = dly[l-1]; last = dly[l-1];
uint64_t mult=1; mult=1;
switch(last) switch(last)
{ {
...@@ -164,8 +168,6 @@ int parse_delay (char *dly, uint64_t *delay_ps) ...@@ -164,8 +168,6 @@ int parse_delay (char *dly, uint64_t *delay_ps)
dly[l] = 0; dly[l] = 0;
double d;
if( sscanf(dly, "%lf", &d) != 1) if( sscanf(dly, "%lf", &d) != 1)
return -1; return -1;
...@@ -194,6 +196,9 @@ int cmd_state(int input, int argc, char *argv[]) ...@@ -194,6 +196,9 @@ int cmd_state(int input, int argc, char *argv[])
int cmd_assign(int input, int argc, char *argv[]) int cmd_assign(int input, int argc, char *argv[])
{ {
struct list_id id;
int rv;
if(argc < 1) if(argc < 1)
{ {
fprintf(stderr,"assign: trigger ID expected\n"); fprintf(stderr,"assign: trigger ID expected\n");
...@@ -207,14 +212,12 @@ int cmd_assign(int input, int argc, char *argv[]) ...@@ -207,14 +212,12 @@ int cmd_assign(int input, int argc, char *argv[])
return 0; return 0;
} }
struct list_id id;
if(parse_trigger_id(argv[0], &id) < 0) if(parse_trigger_id(argv[0], &id) < 0)
{ {
fprintf(stderr, "Error parsing trigger ID\n"); fprintf(stderr, "Error parsing trigger ID\n");
return -1; return -1;
} }
rv = list_in_assign_trigger ( dev, input, &id );
int rv = list_in_assign_trigger ( dev, input, &id );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_in_assign_trigger(): %s\n", strerror(-rv)); fprintf(stderr, "list_in_assign_trigger(): %s\n", strerror(-rv));
...@@ -224,6 +227,7 @@ int rv = list_in_assign_trigger ( dev, input, &id ); ...@@ -224,6 +227,7 @@ int rv = list_in_assign_trigger ( dev, input, &id );
int cmd_unassign(int input, int argc, char *argv[]) int cmd_unassign(int input, int argc, char *argv[])
{ {
int rv;
if(argc >= 1 && !strcmp(argv[0],"-h")) if(argc >= 1 && !strcmp(argv[0],"-h"))
{ {
...@@ -232,7 +236,7 @@ int cmd_unassign(int input, int argc, char *argv[]) ...@@ -232,7 +236,7 @@ int cmd_unassign(int input, int argc, char *argv[])
return 0; return 0;
} }
int rv = list_in_assign_trigger ( dev, input, NULL ); rv = list_in_assign_trigger ( dev, input, NULL );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_in_assign_trigger(): %s\n", strerror(-rv)); fprintf(stderr, "list_in_assign_trigger(): %s\n", strerror(-rv));
...@@ -241,6 +245,7 @@ int cmd_unassign(int input, int argc, char *argv[]) ...@@ -241,6 +245,7 @@ int cmd_unassign(int input, int argc, char *argv[])
int cmd_arm(int input, int argc, char *argv[]) int cmd_arm(int input, int argc, char *argv[])
{ {
int rv;
if(argc >= 1 && !strcmp(argv[0],"-h")) if(argc >= 1 && !strcmp(argv[0],"-h"))
{ {
...@@ -249,7 +254,7 @@ int cmd_arm(int input, int argc, char *argv[]) ...@@ -249,7 +254,7 @@ int cmd_arm(int input, int argc, char *argv[])
return 0; return 0;
} }
int rv = list_in_arm ( dev, input, 1 ); rv = list_in_arm ( dev, input, 1 );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_in_arm(): %s\n", strerror(-rv)); fprintf(stderr, "list_in_arm(): %s\n", strerror(-rv));
...@@ -258,6 +263,8 @@ int cmd_arm(int input, int argc, char *argv[]) ...@@ -258,6 +263,8 @@ int cmd_arm(int input, int argc, char *argv[])
int cmd_disarm(int input, int argc, char *argv[]) int cmd_disarm(int input, int argc, char *argv[])
{ {
int rv;
if(argc >= 1 && !strcmp(argv[0],"-h")) if(argc >= 1 && !strcmp(argv[0],"-h"))
{ {
printf("Command: disarm\n"); printf("Command: disarm\n");
...@@ -265,7 +272,7 @@ int cmd_disarm(int input, int argc, char *argv[]) ...@@ -265,7 +272,7 @@ int cmd_disarm(int input, int argc, char *argv[])
return 0; return 0;
} }
int rv = list_in_arm ( dev, input, 0 ); rv = list_in_arm ( dev, input, 0 );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_in_arm(): %s\n", strerror(-rv)); fprintf(stderr, "list_in_arm(): %s\n", strerror(-rv));
...@@ -274,6 +281,8 @@ int cmd_disarm(int input, int argc, char *argv[]) ...@@ -274,6 +281,8 @@ int cmd_disarm(int input, int argc, char *argv[])
int cmd_enable(int input, int argc, char *argv[]) int cmd_enable(int input, int argc, char *argv[])
{ {
int rv;
if(argc >= 1 && !strcmp(argv[0],"-h")) if(argc >= 1 && !strcmp(argv[0],"-h"))
{ {
printf("Command: enable\n"); printf("Command: enable\n");
...@@ -281,7 +290,7 @@ int cmd_enable(int input, int argc, char *argv[]) ...@@ -281,7 +290,7 @@ int cmd_enable(int input, int argc, char *argv[])
return 0; return 0;
} }
int rv = list_in_enable ( dev, input, 1 ); rv = list_in_enable ( dev, input, 1 );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_in_enable(): %s\n", strerror(-rv)); fprintf(stderr, "list_in_enable(): %s\n", strerror(-rv));
...@@ -290,6 +299,7 @@ int cmd_enable(int input, int argc, char *argv[]) ...@@ -290,6 +299,7 @@ int cmd_enable(int input, int argc, char *argv[])
int cmd_disable(int input, int argc, char *argv[]) int cmd_disable(int input, int argc, char *argv[])
{ {
int rv;
if(argc >= 1 && !strcmp(argv[0],"-h")) if(argc >= 1 && !strcmp(argv[0],"-h"))
{ {
...@@ -298,7 +308,7 @@ int cmd_disable(int input, int argc, char *argv[]) ...@@ -298,7 +308,7 @@ int cmd_disable(int input, int argc, char *argv[])
return 0; return 0;
} }
int rv = list_in_enable ( dev, input, 0 ); rv = list_in_enable ( dev, input, 0 );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_in_enable(): %s\n", strerror(-rv)); fprintf(stderr, "list_in_enable(): %s\n", strerror(-rv));
...@@ -308,6 +318,7 @@ int cmd_disable(int input, int argc, char *argv[]) ...@@ -308,6 +318,7 @@ int cmd_disable(int input, int argc, char *argv[])
int cmd_set_delay(int input, int argc, char *argv[]) int cmd_set_delay(int input, int argc, char *argv[])
{ {
uint64_t dly; uint64_t dly;
int rv;
if(argc < 1) if(argc < 1)
{ {
...@@ -324,7 +335,7 @@ int cmd_set_delay(int input, int argc, char *argv[]) ...@@ -324,7 +335,7 @@ int cmd_set_delay(int input, int argc, char *argv[])
parse_delay(argv[0], &dly); parse_delay(argv[0], &dly);
int rv = list_in_set_delay ( dev, input, dly ); rv = list_in_set_delay ( dev, input, dly );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_in_set_delay(): %s\n", strerror(-rv)); fprintf(stderr, "list_in_set_delay(): %s\n", strerror(-rv));
...@@ -334,6 +345,7 @@ int cmd_set_delay(int input, int argc, char *argv[]) ...@@ -334,6 +345,7 @@ int cmd_set_delay(int input, int argc, char *argv[])
int cmd_set_dead_time(int input, int argc, char *argv[]) int cmd_set_dead_time(int input, int argc, char *argv[])
{ {
uint64_t dly; uint64_t dly;
int rv;
if(argc < 1) if(argc < 1)
{ {
...@@ -351,7 +363,7 @@ int cmd_set_dead_time(int input, int argc, char *argv[]) ...@@ -351,7 +363,7 @@ int cmd_set_dead_time(int input, int argc, char *argv[])
parse_delay(argv[0], &dly); parse_delay(argv[0], &dly);
int rv = list_in_set_dead_time ( dev, input, dly ); rv = list_in_set_dead_time ( dev, input, dly );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_in_set_dead_time(): %s\n", strerror(-rv)); fprintf(stderr, "list_in_set_dead_time(): %s\n", strerror(-rv));
...@@ -360,7 +372,7 @@ int cmd_set_dead_time(int input, int argc, char *argv[]) ...@@ -360,7 +372,7 @@ int cmd_set_dead_time(int input, int argc, char *argv[])
int cmd_set_mode(int input, int argc, char *argv[]) int cmd_set_mode(int input, int argc, char *argv[])
{ {
int mode; int mode, rv;
if(argc < 1) if(argc < 1)
{ {
...@@ -385,7 +397,7 @@ int cmd_set_mode(int input, int argc, char *argv[]) ...@@ -385,7 +397,7 @@ int cmd_set_mode(int input, int argc, char *argv[])
return -1; return -1;
} }
int rv = list_in_set_trigger_mode ( dev, input, mode ); rv = list_in_set_trigger_mode ( dev, input, mode );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_in_set_trigger_mode(): %s\n", strerror(-rv)); fprintf(stderr, "list_in_set_trigger_mode(): %s\n", strerror(-rv));
...@@ -394,6 +406,8 @@ int cmd_set_mode(int input, int argc, char *argv[]) ...@@ -394,6 +406,8 @@ int cmd_set_mode(int input, int argc, char *argv[])
int cmd_reset_counters(int input, int argc, char *argv[]) int cmd_reset_counters(int input, int argc, char *argv[])
{ {
int rv;
if(argc >= 1 && !strcmp(argv[0],"-h")) if(argc >= 1 && !strcmp(argv[0],"-h"))
{ {
printf("Command: reset\n"); printf("Command: reset\n");
...@@ -401,7 +415,7 @@ int cmd_reset_counters(int input, int argc, char *argv[]) ...@@ -401,7 +415,7 @@ int cmd_reset_counters(int input, int argc, char *argv[])
return 0; return 0;
} }
int rv = list_in_reset_counters ( dev, input ); rv = list_in_reset_counters ( dev, input );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_in_reset_counters(): %s\n", strerror(-rv)); fprintf(stderr, "list_in_reset_counters(): %s\n", strerror(-rv));
...@@ -451,9 +465,10 @@ struct command cmds[] = { ...@@ -451,9 +465,10 @@ struct command cmds[] = {
int run_command ( int argc, char *argv[] ) int run_command ( int argc, char *argv[] )
{ {
int i; int i, lun;
char *cmd; char *cmd;
int optind = 1; int optind = 1;
if(argc < 2) if(argc < 2)
{ {
printf("Usage: %s [-l lun] input command [command paremeters]\n\n", argv[0]); printf("Usage: %s [-l lun] input command [command paremeters]\n\n", argv[0]);
...@@ -465,7 +480,7 @@ int run_command ( int argc, char *argv[] ) ...@@ -465,7 +480,7 @@ int run_command ( int argc, char *argv[] )
exit(0); exit(0);
} }
int lun = 0; lun = 0;
if(!strcmp(argv[1], "-l")) if(!strcmp(argv[1], "-l"))
{ {
......
list/test/list-output-test.c
View file @ 086c5071
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
void decode_flags(char *buf, uint32_t flags) void decode_flags(char *buf, uint32_t flags)
{ {
int l;
strcpy(buf,""); strcpy(buf,"");
if( flags & LIST_ENABLED ) if( flags & LIST_ENABLED )
...@@ -21,7 +23,7 @@ void decode_flags(char *buf, uint32_t flags) ...@@ -21,7 +23,7 @@ void decode_flags(char *buf, uint32_t flags)
if( flags & LIST_TRIGGERED ) if( flags & LIST_TRIGGERED )
strcat(buf, "Triggered "); strcat(buf, "Triggered ");
int l = strlen(buf); l = strlen(buf);
if(l) if(l)
buf[l-1] = 0; buf[l-1] = 0;
} }
...@@ -101,12 +103,16 @@ int parse_trigger_id(const char *str, struct list_id *id) ...@@ -101,12 +103,16 @@ int parse_trigger_id(const char *str, struct list_id *id)
int parse_delay (char *dly, uint64_t *delay_ps) int parse_delay (char *dly, uint64_t *delay_ps)
{ {
double d;
int l = strlen(dly); int l = strlen(dly);
char last;
uint64_t mult;
if(!l) if(!l)
return -1; return -1;
char last = dly[l-1]; last = dly[l-1];
uint64_t mult=1; mult=1;
switch(last) switch(last)
{ {
...@@ -119,8 +125,6 @@ int parse_delay (char *dly, uint64_t *delay_ps) ...@@ -119,8 +125,6 @@ int parse_delay (char *dly, uint64_t *delay_ps)
dly[l] = 0; dly[l] = 0;
double d;
if( sscanf(dly, "%lf", &d) != 1) if( sscanf(dly, "%lf", &d) != 1)
return -1; return -1;
...@@ -185,8 +189,7 @@ int cmd_assign(int output, int argc, char *argv[]) ...@@ -185,8 +189,7 @@ int cmd_assign(int output, int argc, char *argv[])
{ {
struct list_trigger_handle h; struct list_trigger_handle h;
struct list_id id_t, id_cond; struct list_id id_t, id_cond;
int cond = 0; int cond = 0, rv;
if(argc < 1) if(argc < 1)
{ {
...@@ -217,7 +220,7 @@ int cmd_assign(int output, int argc, char *argv[]) ...@@ -217,7 +220,7 @@ int cmd_assign(int output, int argc, char *argv[])
} }
} }
int rv = list_out_trig_assign ( dev, &h, output, &id_t, cond ? &id_cond : NULL ); rv = list_out_trig_assign ( dev, &h, output, &id_t, cond ? &id_cond : NULL );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_out_trig_assign(): %s\n", strerror(-rv)); fprintf(stderr, "list_out_trig_assign(): %s\n", strerror(-rv));
...@@ -227,6 +230,9 @@ int cmd_assign(int output, int argc, char *argv[]) ...@@ -227,6 +230,9 @@ int cmd_assign(int output, int argc, char *argv[])
int cmd_show_triggers(int output, int argc, char *argv[]) int cmd_show_triggers(int output, int argc, char *argv[])
{ {
struct list_output_trigger_state trigs[256];
char ts[1024], id [1024];
int rv, i;
if(argc >= 1 && !strcmp(argv[0],"-h")) if(argc >= 1 && !strcmp(argv[0],"-h"))
{ {
...@@ -235,8 +241,7 @@ int cmd_show_triggers(int output, int argc, char *argv[]) ...@@ -235,8 +241,7 @@ int cmd_show_triggers(int output, int argc, char *argv[])
return 0; return 0;
} }
struct list_output_trigger_state trigs[256]; rv = list_out_trig_get_all (dev, output, trigs, 256);
int rv = list_out_trig_get_all (dev, output, trigs, 256);
if(rv < 0) if(rv < 0)
{ {
...@@ -251,10 +256,8 @@ int cmd_show_triggers(int output, int argc, char *argv[]) ...@@ -251,10 +256,8 @@ int cmd_show_triggers(int output, int argc, char *argv[])
} }
printf("Output %d: %d trigger(s) assigned\n", output, rv); printf("Output %d: %d trigger(s) assigned\n", output, rv);
int i;
for(i = 0; i < rv ;i++) for(i = 0; i < rv ;i++)
{ {
char ts[1024], id [1024];
format_ts(ts, trigs[i].delay_trig, 0); format_ts(ts, trigs[i].delay_trig, 0);
format_id(id, trigs[i].trigger); format_id(id, trigs[i].trigger);
printf(" %-3d: ID: %s, delay: %s, enabled: %d\n", i, id, ts, trigs[i].enabled ); printf(" %-3d: ID: %s, delay: %s, enabled: %d\n", i, id, ts, trigs[i].enabled );
...@@ -271,7 +274,6 @@ int cmd_show_triggers(int output, int argc, char *argv[]) ...@@ -271,7 +274,6 @@ int cmd_show_triggers(int output, int argc, char *argv[])
int get_trigger_by_index(int idx, int output, struct list_output_trigger_state *st) int get_trigger_by_index(int idx, int output, struct list_output_trigger_state *st)
{ {
struct list_output_trigger_state trigs[256]; struct list_output_trigger_state trigs[256];
int rv = list_out_trig_get_all (dev, output, trigs, 256); int rv = list_out_trig_get_all (dev, output, trigs, 256);
if(rv < 0) if(rv < 0)
...@@ -294,6 +296,7 @@ int get_trigger_by_index(int idx, int output, struct list_output_trigger_state * ...@@ -294,6 +296,7 @@ int get_trigger_by_index(int idx, int output, struct list_output_trigger_state *
int cmd_unassign(int output, int argc, char *argv[]) int cmd_unassign(int output, int argc, char *argv[])
{ {
struct list_output_trigger_state st; struct list_output_trigger_state st;
int rv, idx;
if(argc < 1) if(argc < 1)
{ {
...@@ -308,14 +311,13 @@ int cmd_unassign(int output, int argc, char *argv[]) ...@@ -308,14 +311,13 @@ int cmd_unassign(int output, int argc, char *argv[])
return 0; return 0;
} }
int rv;
int idx = atoi(argv[0]); idx = atoi(argv[0]);
rv = get_trigger_by_index(idx, output, &st); rv = get_trigger_by_index(idx, output, &st);
if(rv < 0) if(rv < 0)
return rv; return rv;
rv = list_out_trig_remove(dev, &st.handle); rv = list_out_trig_remove(dev, &st.handle);
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_out_trig_remove(): %s\n", strerror(-rv)); fprintf(stderr, "list_out_trig_remove(): %s\n", strerror(-rv));
return rv; return rv;
...@@ -324,8 +326,9 @@ int cmd_unassign(int output, int argc, char *argv[]) ...@@ -324,8 +326,9 @@ int cmd_unassign(int output, int argc, char *argv[])
int cmd_set_delay(int output, int argc, char *argv[]) int cmd_set_delay(int output, int argc, char *argv[])
{ {
struct list_output_trigger_state st;
uint64_t dly; uint64_t dly;
int rv, idx;
if(argc >= 1 && !strcmp(argv[0],"-h")) if(argc >= 1 && !strcmp(argv[0],"-h"))
{ {
...@@ -340,10 +343,8 @@ int cmd_set_delay(int output, int argc, char *argv[]) ...@@ -340,10 +343,8 @@ int cmd_set_delay(int output, int argc, char *argv[])
return -1; return -1;
} }
struct list_output_trigger_state st; idx = atoi(argv[0]);
rv = get_trigger_by_index(idx, output, &st);
int idx = atoi(argv[0]);
int rv = get_trigger_by_index(idx, output, &st);
if(rv < 0) if(rv < 0)
return rv; return rv;
...@@ -357,6 +358,7 @@ int cmd_set_delay(int output, int argc, char *argv[]) ...@@ -357,6 +358,7 @@ int cmd_set_delay(int output, int argc, char *argv[])
int cmd_arm(int input, int argc, char *argv[]) int cmd_arm(int input, int argc, char *argv[])
{ {
int rv;
if(argc >= 1 && !strcmp(argv[0],"-h")) if(argc >= 1 && !strcmp(argv[0],"-h"))
{ {
...@@ -365,8 +367,7 @@ int cmd_arm(int input, int argc, char *argv[]) ...@@ -365,8 +367,7 @@ int cmd_arm(int input, int argc, char *argv[])
return 0; return 0;
} }
int rv = list_in_arm ( dev, input, 1 ); rv = list_in_arm ( dev, input, 1 );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_in_arm(): %s\n", strerror(-rv)); fprintf(stderr, "list_in_arm(): %s\n", strerror(-rv));
return rv; return rv;
...@@ -374,6 +375,8 @@ int cmd_arm(int input, int argc, char *argv[]) ...@@ -374,6 +375,8 @@ int cmd_arm(int input, int argc, char *argv[])
int cmd_disarm(int input, int argc, char *argv[]) int cmd_disarm(int input, int argc, char *argv[])
{ {
int rv;
if(argc >= 1 && !strcmp(argv[0],"-h")) if(argc >= 1 && !strcmp(argv[0],"-h"))
{ {
printf("Command: disarm\n"); printf("Command: disarm\n");
...@@ -381,8 +384,7 @@ int cmd_disarm(int input, int argc, char *argv[]) ...@@ -381,8 +384,7 @@ int cmd_disarm(int input, int argc, char *argv[])
return 0; return 0;
} }
int rv = list_in_arm ( dev, input, 0 ); rv = list_in_arm ( dev, input, 0 );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_in_arm(): %s\n", strerror(-rv)); fprintf(stderr, "list_in_arm(): %s\n", strerror(-rv));
return rv; return rv;
...@@ -390,6 +392,8 @@ int cmd_disarm(int input, int argc, char *argv[]) ...@@ -390,6 +392,8 @@ int cmd_disarm(int input, int argc, char *argv[])
int cmd_enable(int input, int argc, char *argv[]) int cmd_enable(int input, int argc, char *argv[])
{ {
int rv;
if(argc >= 1 && !strcmp(argv[0],"-h")) if(argc >= 1 && !strcmp(argv[0],"-h"))
{ {
printf("Command: enable\n"); printf("Command: enable\n");
...@@ -397,8 +401,7 @@ int cmd_enable(int input, int argc, char *argv[]) ...@@ -397,8 +401,7 @@ int cmd_enable(int input, int argc, char *argv[])
return 0; return 0;
} }
int rv = list_in_enable ( dev, input, 1 ); rv = list_in_enable ( dev, input, 1 );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_in_enable(): %s\n", strerror(-rv)); fprintf(stderr, "list_in_enable(): %s\n", strerror(-rv));
return rv; return rv;
...@@ -406,6 +409,7 @@ int cmd_enable(int input, int argc, char *argv[]) ...@@ -406,6 +409,7 @@ int cmd_enable(int input, int argc, char *argv[])
int cmd_disable(int input, int argc, char *argv[]) int cmd_disable(int input, int argc, char *argv[])
{ {
int rv;
if(argc >= 1 && !strcmp(argv[0],"-h")) if(argc >= 1 && !strcmp(argv[0],"-h"))
{ {
...@@ -414,7 +418,7 @@ int cmd_disable(int input, int argc, char *argv[]) ...@@ -414,7 +418,7 @@ int cmd_disable(int input, int argc, char *argv[])
return 0; return 0;
} }
int rv = list_in_enable ( dev, input, 0 ); rv = list_in_enable ( dev, input, 0 );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_in_enable(): %s\n", strerror(-rv)); fprintf(stderr, "list_in_enable(): %s\n", strerror(-rv));
...@@ -424,6 +428,7 @@ int cmd_disable(int input, int argc, char *argv[]) ...@@ -424,6 +428,7 @@ int cmd_disable(int input, int argc, char *argv[])
int cmd_set_delay(int input, int argc, char *argv[]) int cmd_set_delay(int input, int argc, char *argv[])
{ {
uint64_t dly; uint64_t dly;
int rv;
if(argc < 1) if(argc < 1)
{ {
...@@ -440,8 +445,7 @@ int cmd_set_delay(int input, int argc, char *argv[]) ...@@ -440,8 +445,7 @@ int cmd_set_delay(int input, int argc, char *argv[])
parse_delay(argv[0], &dly); parse_delay(argv[0], &dly);
int rv = list_in_set_delay ( dev, input, dly ); rv = list_in_set_delay ( dev, input, dly );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_in_set_delay(): %s\n", strerror(-rv)); fprintf(stderr, "list_in_set_delay(): %s\n", strerror(-rv));
return rv; return rv;
...@@ -450,6 +454,7 @@ int cmd_set_delay(int input, int argc, char *argv[]) ...@@ -450,6 +454,7 @@ int cmd_set_delay(int input, int argc, char *argv[])
int cmd_set_dead_time(int input, int argc, char *argv[]) int cmd_set_dead_time(int input, int argc, char *argv[])
{ {
uint64_t dly; uint64_t dly;
int rv;
if(argc < 1) if(argc < 1)
{ {
...@@ -467,8 +472,7 @@ int cmd_set_dead_time(int input, int argc, char *argv[]) ...@@ -467,8 +472,7 @@ int cmd_set_dead_time(int input, int argc, char *argv[])
parse_delay(argv[0], &dly); parse_delay(argv[0], &dly);
int rv = list_in_set_dead_time ( dev, input, dly ); rv = list_in_set_dead_time ( dev, input, dly );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_in_set_dead_time(): %s\n", strerror(-rv)); fprintf(stderr, "list_in_set_dead_time(): %s\n", strerror(-rv));
return rv; return rv;
...@@ -476,7 +480,7 @@ int cmd_set_dead_time(int input, int argc, char *argv[]) ...@@ -476,7 +480,7 @@ int cmd_set_dead_time(int input, int argc, char *argv[])
int cmd_set_mode(int input, int argc, char *argv[]) int cmd_set_mode(int input, int argc, char *argv[])
{ {
int mode; int mode, rv;
if(argc < 1) if(argc < 1)
{ {
...@@ -491,7 +495,6 @@ int cmd_set_mode(int input, int argc, char *argv[]) ...@@ -491,7 +495,6 @@ int cmd_set_mode(int input, int argc, char *argv[])
return 0; return 0;
} }
if(!strcmp(argv[0],"single")) if(!strcmp(argv[0],"single"))
mode = LIST_TRIGGER_MODE_SINGLE; mode = LIST_TRIGGER_MODE_SINGLE;
else if(!strcmp(argv[0],"auto")) else if(!strcmp(argv[0],"auto"))
...@@ -501,8 +504,7 @@ int cmd_set_mode(int input, int argc, char *argv[]) ...@@ -501,8 +504,7 @@ int cmd_set_mode(int input, int argc, char *argv[])
return -1; return -1;
} }
int rv = list_in_set_trigger_mode ( dev, input, mode ); rv = list_in_set_trigger_mode ( dev, input, mode );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_in_set_trigger_mode(): %s\n", strerror(-rv)); fprintf(stderr, "list_in_set_trigger_mode(): %s\n", strerror(-rv));
return rv; return rv;
...@@ -510,6 +512,8 @@ int cmd_set_mode(int input, int argc, char *argv[]) ...@@ -510,6 +512,8 @@ int cmd_set_mode(int input, int argc, char *argv[])
int cmd_reset_counters(int input, int argc, char *argv[]) int cmd_reset_counters(int input, int argc, char *argv[])
{ {
int rv;
if(argc >= 1 && !strcmp(argv[0],"-h")) if(argc >= 1 && !strcmp(argv[0],"-h"))
{ {
printf("Command: reset\n"); printf("Command: reset\n");
...@@ -517,8 +521,7 @@ int cmd_reset_counters(int input, int argc, char *argv[]) ...@@ -517,8 +521,7 @@ int cmd_reset_counters(int input, int argc, char *argv[])
return 0; return 0;
} }
int rv = list_in_reset_counters ( dev, input ); rv = list_in_reset_counters ( dev, input );
if(rv < 0) if(rv < 0)
fprintf(stderr, "list_in_reset_counters(): %s\n", strerror(-rv)); fprintf(stderr, "list_in_reset_counters(): %s\n", strerror(-rv));
return rv; return rv;
...@@ -575,9 +578,10 @@ struct command cmds[] = { ...@@ -575,9 +578,10 @@ struct command cmds[] = {
int run_command ( int argc, char *argv[] ) int run_command ( int argc, char *argv[] )
{ {
int i; int i, output, lun;
char *cmd; char *cmd;
int optind = 1; int optind = 1;
if(argc < 2) if(argc < 2)
{ {
printf("Usage: %s [-l lun] <output> <command> [command paremeters]\n\n", argv[0]); printf("Usage: %s [-l lun] <output> <command> [command paremeters]\n\n", argv[0]);
...@@ -589,7 +593,7 @@ int run_command ( int argc, char *argv[] ) ...@@ -589,7 +593,7 @@ int run_command ( int argc, char *argv[] )
exit(0); exit(0);
} }
int lun = 0; lun = 0;
if(!strcmp(argv[1], "-l")) if(!strcmp(argv[1], "-l"))
{ {
...@@ -616,7 +620,7 @@ int run_command ( int argc, char *argv[] ) ...@@ -616,7 +620,7 @@ int run_command ( int argc, char *argv[] )
exit(-1); exit(-1);
} }
int output = atoi(argv[optind]); output = atoi(argv[optind]);
cmd = argv[optind+1]; cmd = argv[optind+1];
for(i=0; cmds[i].handler; i++) for(i=0; cmds[i].handler; i++)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment