summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2016-03-01 10:49:22 +1000
committerBenjamin Tissoires <benjamin.tissoires@gmail.com>2016-03-01 15:10:04 +0100
commit3974486d689d71fad0255be9e309ca2c758a2aeb (patch)
treee16ba9c93b900da7770db7dce92a87e43c766a10
parent2739d68243f7b81b2f49b759d970e4729d7bb6d7 (diff)
evemu-record: move describe_device into each mode
This doesn't make sense just yet, it's prep work for an upcoming patch to call describe_device multiple times in the evemu-record case. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
-rw-r--r--tools/evemu-record.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/tools/evemu-record.c b/tools/evemu-record.c
index 1a81767..abf8ffe 100644
--- a/tools/evemu-record.c
+++ b/tools/evemu-record.c
@@ -151,11 +151,6 @@ int main(int argc, char *argv[])
}
}
- if (describe_device(output, fd)) {
- fprintf(stderr, "error: could not describe device\n");
- goto out;
- }
-
if (mode == EVEMU_RECORD) {
#ifdef EVIOCSCLOCKID
int clockid = CLOCK_MONOTONIC;
@@ -164,11 +159,21 @@ int main(int argc, char *argv[])
if (!test_grab_device(fd))
goto out;
+ if (describe_device(output, fd)) {
+ fprintf(stderr, "error: could not describe device\n");
+ goto out;
+ }
+
fprintf(output, "################################\n");
fprintf(output, "# Waiting for events #\n");
fprintf(output, "################################\n");
if (evemu_record(output, fd, INFINITE))
fprintf(stderr, "error: could not record device\n");
+ } else if (mode == EVEMU_DESCRIBE) {
+ if (describe_device(output, fd)) {
+ fprintf(stderr, "error: could not describe device\n");
+ goto out;
+ }
}
rc = 0;