Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
M
Mock Turtle
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Mock Turtle
Commits
086c5071
Commit
086c5071
authored
Oct 13, 2014
by
Federico Vaga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test: style fix
Signed-off-by:
Federico Vaga
<
federico.vaga@cern.ch
>
parent
e2487f88
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
137 additions
and
114 deletions
+137
-114
list-boot.c
list/test/list-boot.c
+4
-3
list-dbg.c
list/test/list-dbg.c
+6
-3
list-input-test.c
list/test/list-input-test.c
+57
-42
list-output-test.c
list/test/list-output-test.c
+70
-66
No files found.
list/test/list-boot.c
View file @
086c5071
...
...
@@ -4,15 +4,17 @@
void
list_boot_node
(
struct
list_node
*
dev
);
main
(
int
argc
,
char
*
argv
[])
int
main
(
int
argc
,
char
*
argv
[])
{
int
lun
;
if
(
argc
<
2
)
{
printf
(
"usage: %s <lun>
\n
"
,
argv
[
0
]);
return
0
;
}
int
lun
=
atoi
(
argv
[
1
]);
lun
=
atoi
(
argv
[
1
]);
printf
(
"Booting LIST Node @ Lun %d
\n
"
,
lun
);
...
...
@@ -28,5 +30,4 @@ main(int argc, char *argv[])
sleep
(
2
);
return
0
;
}
list/test/list-dbg.c
View file @
086c5071
...
...
@@ -4,17 +4,20 @@
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
)
{
printf
(
"usage: %s <lun>
\n
"
,
argv
[
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
);
...
...
list/test/list-input-test.c
View file @
086c5071
...
...
@@ -8,6 +8,7 @@
void
decode_flags
(
char
*
buf
,
uint32_t
flags
)
{
int
l
;
strcpy
(
buf
,
""
);
if
(
flags
&
LIST_ENABLED
)
...
...
@@ -21,7 +22,7 @@ void decode_flags(char *buf, uint32_t flags)
if
(
flags
&
LIST_TRIGGERED
)
strcat
(
buf
,
"Triggered "
);
int
l
=
strlen
(
buf
);
l
=
strlen
(
buf
);
if
(
l
)
buf
[
l
-
1
]
=
0
;
}
...
...
@@ -46,7 +47,7 @@ void decode_mode (char *buf, int mode)
void
decode_log_level
(
char
*
buf
,
uint32_t
flags
)
{
strcpy
(
buf
,
""
);
strcpy
(
buf
,
""
);
if
(
flags
==
0
)
strcpy
(
buf
,
"off"
);
if
(
flags
&
LIST_LOG_RAW
)
...
...
@@ -105,7 +106,7 @@ void dump_input_state ( struct list_input_state *state )
printf
(
"Channel %d: disabled
\n
"
,
state
->
input
);
return
;
}
decode_flags
(
tmp
,
state
->
flags
);
printf
(
"Channel %d state:
\n
"
,
state
->
input
);
printf
(
" - Flags: %s
\n
"
,
tmp
);
...
...
@@ -130,7 +131,6 @@ void dump_input_state ( struct list_input_state *state )
format_ts
(
tmp
,
state
->
last_sent
.
ts
,
1
);
format_id
(
tmp2
,
state
->
last_sent
.
id
);
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
);
...
...
@@ -147,12 +147,16 @@ int parse_trigger_id(const char *str, struct list_id *id)
int
parse_delay
(
char
*
dly
,
uint64_t
*
delay_ps
)
{
int
l
=
strlen
(
dly
);
char
last
;
uint64_t
mult
;
double
d
;
if
(
!
l
)
return
-
1
;
char
last
=
dly
[
l
-
1
];
uint64_t
mult
=
1
;
last
=
dly
[
l
-
1
];
mult
=
1
;
switch
(
last
)
{
case
'u'
:
mult
=
1000ULL
*
1000
;
l
--
;
break
;
...
...
@@ -161,11 +165,9 @@ int parse_delay (char *dly, uint64_t *delay_ps)
case
'p'
:
mult
=
1
;
l
--
;
break
;
default:
mult
=
1
;
break
;
}
dly
[
l
]
=
0
;
double
d
;
if
(
sscanf
(
dly
,
"%lf"
,
&
d
)
!=
1
)
return
-
1
;
...
...
@@ -181,25 +183,28 @@ int cmd_state(int input, int argc, char *argv[])
{
struct
list_input_state
state
;
int
rv
=
list_in_get_state
(
dev
,
input
,
&
state
);
if
(
rv
<
0
)
{
fprintf
(
stderr
,
"list_in_get_state(): %s
\n
"
,
strerror
(
-
rv
));
return
rv
;
}
dump_input_state
(
&
state
);
return
0
;
}
int
cmd_assign
(
int
input
,
int
argc
,
char
*
argv
[])
{
struct
list_id
id
;
int
rv
;
if
(
argc
<
1
)
{
fprintf
(
stderr
,
"assign: trigger ID expected
\n
"
);
return
-
1
;
}
if
(
argc
>=
1
&&
!
strcmp
(
argv
[
0
],
"-h"
))
{
printf
(
"Command: assign <trigger ID>
\n
"
);
...
...
@@ -207,14 +212,12 @@ int cmd_assign(int input, int argc, char *argv[])
return
0
;
}
struct
list_id
id
;
if
(
parse_trigger_id
(
argv
[
0
],
&
id
)
<
0
)
{
fprintf
(
stderr
,
"Error parsing trigger ID
\n
"
);
return
-
1
;
}
int
rv
=
list_in_assign_trigger
(
dev
,
input
,
&
id
);
rv
=
list_in_assign_trigger
(
dev
,
input
,
&
id
);
if
(
rv
<
0
)
fprintf
(
stderr
,
"list_in_assign_trigger(): %s
\n
"
,
strerror
(
-
rv
));
...
...
@@ -224,7 +227,8 @@ int rv = list_in_assign_trigger ( dev, input, &id );
int
cmd_unassign
(
int
input
,
int
argc
,
char
*
argv
[])
{
int
rv
;
if
(
argc
>=
1
&&
!
strcmp
(
argv
[
0
],
"-h"
))
{
printf
(
"Command: unassign
\n
"
);
...
...
@@ -232,7 +236,7 @@ int cmd_unassign(int input, int argc, char *argv[])
return
0
;
}
int
rv
=
list_in_assign_trigger
(
dev
,
input
,
NULL
);
rv
=
list_in_assign_trigger
(
dev
,
input
,
NULL
);
if
(
rv
<
0
)
fprintf
(
stderr
,
"list_in_assign_trigger(): %s
\n
"
,
strerror
(
-
rv
));
...
...
@@ -241,6 +245,7 @@ int cmd_unassign(int input, int argc, char *argv[])
int
cmd_arm
(
int
input
,
int
argc
,
char
*
argv
[])
{
int
rv
;
if
(
argc
>=
1
&&
!
strcmp
(
argv
[
0
],
"-h"
))
{
...
...
@@ -249,7 +254,7 @@ int cmd_arm(int input, int argc, char *argv[])
return
0
;
}
int
rv
=
list_in_arm
(
dev
,
input
,
1
);
rv
=
list_in_arm
(
dev
,
input
,
1
);
if
(
rv
<
0
)
fprintf
(
stderr
,
"list_in_arm(): %s
\n
"
,
strerror
(
-
rv
));
...
...
@@ -258,6 +263,8 @@ int cmd_arm(int input, int argc, char *argv[])
int
cmd_disarm
(
int
input
,
int
argc
,
char
*
argv
[])
{
int
rv
;
if
(
argc
>=
1
&&
!
strcmp
(
argv
[
0
],
"-h"
))
{
printf
(
"Command: disarm
\n
"
);
...
...
@@ -265,7 +272,7 @@ int cmd_disarm(int input, int argc, char *argv[])
return
0
;
}
int
rv
=
list_in_arm
(
dev
,
input
,
0
);
rv
=
list_in_arm
(
dev
,
input
,
0
);
if
(
rv
<
0
)
fprintf
(
stderr
,
"list_in_arm(): %s
\n
"
,
strerror
(
-
rv
));
...
...
@@ -274,14 +281,16 @@ int cmd_disarm(int input, int argc, char *argv[])
int
cmd_enable
(
int
input
,
int
argc
,
char
*
argv
[])
{
int
rv
;
if
(
argc
>=
1
&&
!
strcmp
(
argv
[
0
],
"-h"
))
{
printf
(
"Command: enable
\n
"
);
printf
(
"Enables the TDC input.
\n
"
);
return
0
;
}
int
rv
=
list_in_enable
(
dev
,
input
,
1
);
rv
=
list_in_enable
(
dev
,
input
,
1
);
if
(
rv
<
0
)
fprintf
(
stderr
,
"list_in_enable(): %s
\n
"
,
strerror
(
-
rv
));
...
...
@@ -290,6 +299,7 @@ int cmd_enable(int input, int argc, char *argv[])
int
cmd_disable
(
int
input
,
int
argc
,
char
*
argv
[])
{
int
rv
;
if
(
argc
>=
1
&&
!
strcmp
(
argv
[
0
],
"-h"
))
{
...
...
@@ -298,7 +308,7 @@ int cmd_disable(int input, int argc, char *argv[])
return
0
;
}
int
rv
=
list_in_enable
(
dev
,
input
,
0
);
rv
=
list_in_enable
(
dev
,
input
,
0
);
if
(
rv
<
0
)
fprintf
(
stderr
,
"list_in_enable(): %s
\n
"
,
strerror
(
-
rv
));
...
...
@@ -308,23 +318,24 @@ int cmd_disable(int input, int argc, char *argv[])
int
cmd_set_delay
(
int
input
,
int
argc
,
char
*
argv
[])
{
uint64_t
dly
;
int
rv
;
if
(
argc
<
1
)
{
fprintf
(
stderr
,
"delay: delay value expected
\n
"
);
return
-
1
;
}
if
(
argc
>=
1
&&
!
strcmp
(
argv
[
0
],
"-h"
))
{
printf
(
"Command: delay <delay value>
\n
"
);
printf
(
"Sets trigger delay (0 s - 1 s). Default unit is 1 picosecond. Fractional values and SI suffixes are accepted (e.g. 1.2u, 10n, etc.)
\n
"
);
return
0
;
}
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
)
fprintf
(
stderr
,
"list_in_set_delay(): %s
\n
"
,
strerror
(
-
rv
));
...
...
@@ -334,13 +345,14 @@ int cmd_set_delay(int input, int argc, char *argv[])
int
cmd_set_dead_time
(
int
input
,
int
argc
,
char
*
argv
[])
{
uint64_t
dly
;
int
rv
;
if
(
argc
<
1
)
{
fprintf
(
stderr
,
"deadtime: dead time value expected
\n
"
);
return
-
1
;
}
if
(
argc
>=
1
&&
!
strcmp
(
argv
[
0
],
"-h"
))
{
printf
(
"Command: deadtime <dead time value>
\n
"
);
...
...
@@ -348,10 +360,10 @@ int cmd_set_dead_time(int input, int argc, char *argv[])
printf
(
"Default unit is 1 picosecond. Fractional values and SI suffixes are accepted (e.g. 1.2u, 10n, etc.)
\n
"
);
return
0
;
}
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
)
fprintf
(
stderr
,
"list_in_set_dead_time(): %s
\n
"
,
strerror
(
-
rv
));
...
...
@@ -360,21 +372,21 @@ int cmd_set_dead_time(int input, int argc, char *argv[])
int
cmd_set_mode
(
int
input
,
int
argc
,
char
*
argv
[])
{
int
mode
;
int
mode
,
rv
;
if
(
argc
<
1
)
{
fprintf
(
stderr
,
"mode: mode expected
\n
"
);
return
-
1
;
}
if
(
argc
>=
1
&&
!
strcmp
(
argv
[
0
],
"-h"
))
{
printf
(
"Command: mode <single|auto>
\n
"
);
printf
(
"Sets triggering mode. Single = process single pulse after arming, auto = process all subsequent pulses.
\n
"
);
return
0
;
}
if
(
!
strcmp
(
argv
[
0
],
"single"
))
mode
=
LIST_TRIGGER_MODE_SINGLE
;
...
...
@@ -385,7 +397,7 @@ int cmd_set_mode(int input, int argc, char *argv[])
return
-
1
;
}
int
rv
=
list_in_set_trigger_mode
(
dev
,
input
,
mode
);
rv
=
list_in_set_trigger_mode
(
dev
,
input
,
mode
);
if
(
rv
<
0
)
fprintf
(
stderr
,
"list_in_set_trigger_mode(): %s
\n
"
,
strerror
(
-
rv
));
...
...
@@ -394,15 +406,17 @@ int cmd_set_mode(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"
))
{
printf
(
"Command: reset
\n
"
);
printf
(
"Resets statistics counters & 'last' values
\n
"
);
return
0
;
}
int
rv
=
list_in_reset_counters
(
dev
,
input
);
rv
=
list_in_reset_counters
(
dev
,
input
);
if
(
rv
<
0
)
fprintf
(
stderr
,
"list_in_reset_counters(): %s
\n
"
,
strerror
(
-
rv
));
return
rv
;
...
...
@@ -416,14 +430,14 @@ int cmd_sw_trigger(int input, int argc, char *argv[])
fprintf
(
stderr
,
"swtrig: trigger ID expected
\n
"
);
return
-
1
;
}
if
(
argc
>=
1
&&
!
strcmp
(
argv
[
0
],
"-h"
))
{
printf
(
"Command: swtrig <trigger ID> [holdoff time]
\n
"
);
printf
(
"Sends a software-forced trigger message with given trigger ID, after certain holdoff time from now (default = 100ms)
\n
"
);
return
0
;
}
return
0
;
}
...
...
@@ -451,9 +465,10 @@ struct command cmds[] = {
int
run_command
(
int
argc
,
char
*
argv
[]
)
{
int
i
;
int
i
,
lun
;
char
*
cmd
;
int
optind
=
1
;
if
(
argc
<
2
)
{
printf
(
"Usage: %s [-l lun] input command [command paremeters]
\n\n
"
,
argv
[
0
]);
...
...
@@ -465,7 +480,7 @@ int run_command ( int argc, char *argv[] )
exit
(
0
);
}
int
lun
=
0
;
lun
=
0
;
if
(
!
strcmp
(
argv
[
1
],
"-l"
))
{
...
...
@@ -494,7 +509,7 @@ int run_command ( int argc, char *argv[] )
input
=
atoi
(
argv
[
optind
]);
cmd
=
argv
[
optind
+
1
];
for
(
i
=
0
;
cmds
[
i
].
handler
;
i
++
)
if
(
!
strcmp
(
cmds
[
i
].
name
,
cmd
))
{
...
...
list/test/list-output-test.c
View file @
086c5071
...
...
@@ -8,6 +8,8 @@
void
decode_flags
(
char
*
buf
,
uint32_t
flags
)
{
int
l
;
strcpy
(
buf
,
""
);
if
(
flags
&
LIST_ENABLED
)
...
...
@@ -21,7 +23,7 @@ void decode_flags(char *buf, uint32_t flags)
if
(
flags
&
LIST_TRIGGERED
)
strcat
(
buf
,
"Triggered "
);
int
l
=
strlen
(
buf
);
l
=
strlen
(
buf
);
if
(
l
)
buf
[
l
-
1
]
=
0
;
}
...
...
@@ -44,7 +46,7 @@ void decode_mode (char *buf, int mode)
void
decode_log_level
(
char
*
buf
,
uint32_t
flags
)
{
strcpy
(
buf
,
""
);
strcpy
(
buf
,
""
);
if
(
flags
==
0
)
strcpy
(
buf
,
"off"
);
if
(
flags
&
LIST_LOG_RAW
)
...
...
@@ -101,13 +103,17 @@ int parse_trigger_id(const char *str, struct list_id *id)
int
parse_delay
(
char
*
dly
,
uint64_t
*
delay_ps
)
{
double
d
;
int
l
=
strlen
(
dly
);
char
last
;
uint64_t
mult
;
if
(
!
l
)
return
-
1
;
char
last
=
dly
[
l
-
1
];
uint64_t
mult
=
1
;
last
=
dly
[
l
-
1
];
mult
=
1
;
switch
(
last
)
{
case
'u'
:
mult
=
1000ULL
*
1000
;
l
--
;
break
;
...
...
@@ -116,11 +122,9 @@ int parse_delay (char *dly, uint64_t *delay_ps)
case
'p'
:
mult
=
1
;
l
--
;
break
;
default:
mult
=
1
;
break
;
}
dly
[
l
]
=
0
;
double
d
;
if
(
sscanf
(
dly
,
"%lf"
,
&
d
)
!=
1
)
return
-
1
;
...
...
@@ -170,13 +174,13 @@ int cmd_state(int output, int argc, char *argv[])
{
struct
list_output_state
state
;
int
rv
=
list_out_get_state
(
dev
,
output
,
&
state
);
if
(
rv
<
0
)
{
fprintf
(
stderr
,
"list_out_get_state(): %s
\n
"
,
strerror
(
-
rv
));
return
rv
;
}
dump_output_state
(
&
state
);
return
0
;
}
...
...
@@ -185,15 +189,14 @@ int cmd_assign(int output, int argc, char *argv[])
{
struct
list_trigger_handle
h
;
struct
list_id
id_t
,
id_cond
;
int
cond
=
0
;
int
cond
=
0
,
rv
;
if
(
argc
<
1
)
{
fprintf
(
stderr
,
"assign: trigger ID expected
\n
"
);
return
-
1
;
}
if
(
argc
>=
1
&&
!
strcmp
(
argv
[
0
],
"-h"
))
{
printf
(
"Command: assign <trigger ID> [condition ID]
\n
"
);
...
...
@@ -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
)
fprintf
(
stderr
,
"list_out_trig_assign(): %s
\n
"
,
strerror
(
-
rv
));
...
...
@@ -227,7 +230,10 @@ int cmd_assign(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"
))
{
printf
(
"Command: shows
\n
"
);
...
...
@@ -235,8 +241,7 @@ int cmd_show_triggers(int output, int argc, char *argv[])
return
0
;
}
struct
list_output_trigger_state
trigs
[
256
];
int
rv
=
list_out_trig_get_all
(
dev
,
output
,
trigs
,
256
);
rv
=
list_out_trig_get_all
(
dev
,
output
,
trigs
,
256
);
if
(
rv
<
0
)
{
...
...
@@ -251,10 +256,8 @@ int cmd_show_triggers(int output, int argc, char *argv[])
}
printf
(
"Output %d: %d trigger(s) assigned
\n
"
,
output
,
rv
);
int
i
;
for
(
i
=
0
;
i
<
rv
;
i
++
)
{
char
ts
[
1024
],
id
[
1024
];
format_ts
(
ts
,
trigs
[
i
].
delay_trig
,
0
);
format_id
(
id
,
trigs
[
i
].
trigger
);
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[])
int
get_trigger_by_index
(
int
idx
,
int
output
,
struct
list_output_trigger_state
*
st
)
{
struct
list_output_trigger_state
trigs
[
256
];
int
rv
=
list_out_trig_get_all
(
dev
,
output
,
trigs
,
256
);
if
(
rv
<
0
)
...
...
@@ -284,23 +286,24 @@ int get_trigger_by_index(int idx, int output, struct list_output_trigger_state *
{
fprintf
(
stderr
,
"unassign: trigger index out of range
\n
"
);
return
-
1
;
}
*
st
=
trigs
[
idx
];
return
0
;
return
0
;
}
int
cmd_unassign
(
int
output
,
int
argc
,
char
*
argv
[])
{
struct
list_output_trigger_state
st
;
int
rv
,
idx
;
if
(
argc
<
1
)
{
fprintf
(
stderr
,
"unassign: trigger index expected
\n
"
);
return
-
1
;
}
if
(
argc
>=
1
&&
!
strcmp
(
argv
[
0
],
"-h"
))
{
printf
(
"Command: unassign <number>
\n
"
);
...
...
@@ -308,14 +311,13 @@ int cmd_unassign(int output, int argc, char *argv[])
return
0
;
}
int
rv
;
i
nt
i
dx
=
atoi
(
argv
[
0
]);
idx
=
atoi
(
argv
[
0
]);
rv
=
get_trigger_by_index
(
idx
,
output
,
&
st
);
if
(
rv
<
0
)
return
rv
;
rv
=
list_out_trig_remove
(
dev
,
&
st
.
handle
);
rv
=
list_out_trig_remove
(
dev
,
&
st
.
handle
);
if
(
rv
<
0
)
fprintf
(
stderr
,
"list_out_trig_remove(): %s
\n
"
,
strerror
(
-
rv
));
return
rv
;
...
...
@@ -324,8 +326,9 @@ int cmd_unassign(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
;
int
rv
,
idx
;
if
(
argc
>=
1
&&
!
strcmp
(
argv
[
0
],
"-h"
))
{
...
...
@@ -340,23 +343,22 @@ int cmd_set_delay(int output, int argc, char *argv[])
return
-
1
;
}
struct
list_output_trigger_state
st
;
int
idx
=
atoi
(
argv
[
0
]);
int
rv
=
get_trigger_by_index
(
idx
,
output
,
&
st
);
idx
=
atoi
(
argv
[
0
]);
rv
=
get_trigger_by_index
(
idx
,
output
,
&
st
);
if
(
rv
<
0
)
return
rv
;
parse_delay
(
argv
[
1
],
&
dly
);
rv
=
list_out_trig_set_delay
(
dev
,
&
st
.
handle
,
dly
);
return
rv
;
}
}
#if 0
int cmd_arm(int input, int argc, char *argv[])
{
int rv;
if(argc >= 1 && !strcmp(argv[0],"-h"))
{
...
...
@@ -365,8 +367,7 @@ int cmd_arm(int input, int argc, char *argv[])
return 0;
}
int rv = list_in_arm ( dev, input, 1 );
rv = list_in_arm ( dev, input, 1 );
if(rv < 0)
fprintf(stderr, "list_in_arm(): %s\n", strerror(-rv));
return rv;
...
...
@@ -374,6 +375,8 @@ int cmd_arm(int input, int argc, char *argv[])
int cmd_disarm(int input, int argc, char *argv[])
{
int rv;
if(argc >= 1 && !strcmp(argv[0],"-h"))
{
printf("Command: disarm\n");
...
...
@@ -381,8 +384,7 @@ int cmd_disarm(int input, int argc, char *argv[])
return 0;
}
int rv = list_in_arm ( dev, input, 0 );
rv = list_in_arm ( dev, input, 0 );
if(rv < 0)
fprintf(stderr, "list_in_arm(): %s\n", strerror(-rv));
return rv;
...
...
@@ -390,15 +392,16 @@ int cmd_disarm(int input, int argc, char *argv[])
int cmd_enable(int input, int argc, char *argv[])
{
int rv;
if(argc >= 1 && !strcmp(argv[0],"-h"))
{
printf("Command: enable\n");
printf("Enables the TDC input.\n");
return 0;
}
int rv = list_in_enable ( dev, input, 1 );
rv = list_in_enable ( dev, input, 1 );
if(rv < 0)
fprintf(stderr, "list_in_enable(): %s\n", strerror(-rv));
return rv;
...
...
@@ -406,6 +409,7 @@ int cmd_enable(int input, int argc, char *argv[])
int cmd_disable(int input, int argc, char *argv[])
{
int rv;
if(argc >= 1 && !strcmp(argv[0],"-h"))
{
...
...
@@ -414,7 +418,7 @@ int cmd_disable(int input, int argc, char *argv[])
return 0;
}
int
rv = list_in_enable ( dev, input, 0 );
rv = list_in_enable ( dev, input, 0 );
if(rv < 0)
fprintf(stderr, "list_in_enable(): %s\n", strerror(-rv));
...
...
@@ -424,24 +428,24 @@ int cmd_disable(int input, int argc, char *argv[])
int cmd_set_delay(int input, int argc, char *argv[])
{
uint64_t dly;
int rv;
if(argc < 1)
{
fprintf(stderr,"delay: delay value expected\n");
return -1;
}
if(argc >= 1 && !strcmp(argv[0],"-h"))
{
printf("Command: delay <delay value>\n");
printf("Sets trigger delay (0 s - 1 s). Default unit is 1 picosecond. Fractional values and SI suffixes are accepted (e.g. 1.2u, 10n, etc.)\n");
return 0;
}
parse_delay(argv[0], &dly);
int rv = list_in_set_delay ( dev, input, dly
);
parse_delay(argv[0], &dly
);
rv = list_in_set_delay ( dev, input, dly );
if(rv < 0)
fprintf(stderr, "list_in_set_delay(): %s\n", strerror(-rv));
return rv;
...
...
@@ -450,13 +454,14 @@ int cmd_set_delay(int input, int argc, char *argv[])
int cmd_set_dead_time(int input, int argc, char *argv[])
{
uint64_t dly;
int rv;
if(argc < 1)
{
fprintf(stderr,"deadtime: dead time value expected\n");
return -1;
}
if(argc >= 1 && !strcmp(argv[0],"-h"))
{
printf("Command: deadtime <dead time value>\n");
...
...
@@ -464,11 +469,10 @@ int cmd_set_dead_time(int input, int argc, char *argv[])
printf("Default unit is 1 picosecond. Fractional values and SI suffixes are accepted (e.g. 1.2u, 10n, etc.)\n");
return 0;
}
parse_delay(argv[0], &dly);
int rv = list_in_set_dead_time ( dev, input, dly
);
parse_delay(argv[0], &dly
);
rv = list_in_set_dead_time ( dev, input, dly );
if(rv < 0)
fprintf(stderr, "list_in_set_dead_time(): %s\n", strerror(-rv));
return rv;
...
...
@@ -476,21 +480,20 @@ int cmd_set_dead_time(int input, int argc, char *argv[])
int cmd_set_mode(int input, int argc, char *argv[])
{
int mode;
int mode
, rv
;
if(argc < 1)
{
fprintf(stderr,"mode: mode expected\n");
return -1;
}
if(argc >= 1 && !strcmp(argv[0],"-h"))
{
printf("Command: mode <single|auto>\n");
printf("Sets triggering mode. Single = process single pulse after arming, auto = process all subsequent pulses.\n");
return 0;
}
if(!strcmp(argv[0],"single"))
mode = LIST_TRIGGER_MODE_SINGLE;
...
...
@@ -501,8 +504,7 @@ int cmd_set_mode(int input, int argc, char *argv[])
return -1;
}
int rv = list_in_set_trigger_mode ( dev, input, mode );
rv = list_in_set_trigger_mode ( dev, input, mode );
if(rv < 0)
fprintf(stderr, "list_in_set_trigger_mode(): %s\n", strerror(-rv));
return rv;
...
...
@@ -510,15 +512,16 @@ int cmd_set_mode(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"))
{
printf("Command: reset\n");
printf("Resets statistics counters & 'last' values\n");
return 0;
}
int rv = list_in_reset_counters ( dev, input );
rv = list_in_reset_counters ( dev, input );
if(rv < 0)
fprintf(stderr, "list_in_reset_counters(): %s\n", strerror(-rv));
return rv;
...
...
@@ -532,14 +535,14 @@ int cmd_sw_trigger(int input, int argc, char *argv[])
fprintf(stderr,"swtrig: trigger ID expected\n");
return -1;
}
if(argc >= 1 && !strcmp(argv[0],"-h"))
{
printf("Command: swtrig <trigger ID> [holdoff time]\n");
printf("Sends a software-forced trigger message with given trigger ID, after certain holdoff time from now (default = 100ms)\n");
return 0;
}
return 0;
}
...
...
@@ -575,9 +578,10 @@ struct command cmds[] = {
int
run_command
(
int
argc
,
char
*
argv
[]
)
{
int
i
;
int
i
,
output
,
lun
;
char
*
cmd
;
int
optind
=
1
;
if
(
argc
<
2
)
{
printf
(
"Usage: %s [-l lun] <output> <command> [command paremeters]
\n\n
"
,
argv
[
0
]);
...
...
@@ -589,7 +593,7 @@ int run_command ( int argc, char *argv[] )
exit
(
0
);
}
int
lun
=
0
;
lun
=
0
;
if
(
!
strcmp
(
argv
[
1
],
"-l"
))
{
...
...
@@ -616,9 +620,9 @@ int run_command ( int argc, char *argv[] )
exit
(
-
1
);
}
int
output
=
atoi
(
argv
[
optind
]);
output
=
atoi
(
argv
[
optind
]);
cmd
=
argv
[
optind
+
1
];
for
(
i
=
0
;
cmds
[
i
].
handler
;
i
++
)
if
(
!
strcmp
(
cmds
[
i
].
name
,
cmd
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment