wrtd: fix sw trigger

Signed-off-by: Federico Vaga <federico.vaga@gmail.com> NOTE This commit has been created by `git subtree` on the Mock Turtle repository on tag mock-turtle-2.0 This commit will not compile

wrtd: fix sw trigger
Signed-off-by: Federico Vaga <federico.vaga@gmail.com> NOTE This commit has been created by `git subtree` on the Mock Turtle repository on tag mock-turtle-2.0 This commit will not compile
b3e299c0 · Federico Vaga · fcf8d63e · b3e299c0 · b3e299c0
Commit b3e299c0 authored Nov 28, 2014 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 27 additions and 1 deletion

libwrtd.h lib/libwrtd.h +4 -0

wrtd-in-config.c tools/wrtd-in-config.c +23 -1

No files found.
--- a/lib/libwrtd.h
+++ b/lib/libwrtd.h
@@ -190,5 +190,9 @@ extern int wrtd_out_reset_counters(struct wrtd_node *dev, unsigned int output);
 extern int wrtd_out_check_triggered(struct wrtd_node *dev, unsigned int output);
 //int wrtd_out_wait_trigger(struct wrtd_node*, int output_mask, struct wrtd_trig_id *id);

+/**
+ * @file libwrtd-internal.c
+ */
+extern struct wr_timestamp picos_to_ts(uint64_t p);

 #endif
--- a/tools/wrtd-in-config.c
+++ b/tools/wrtd-in-config.c
@@ -238,7 +238,29 @@ static int wrtd_cmd_reset(struct wrtd_node *wrtd, int input,
 static int wrtd_cmd_sw_trigger(struct wrtd_node *wrtd, int input,
 			  int argc, char *argv[])
 {
-	return wrtd_in_trigger_software(wrtd, input);
+	struct wrtd_trigger_entry ent;
+	uint64_t ts;
+	int ret;
+
+	if (argc != 1 || argv[0] == NULL) {
+		fprintf(stderr, "Missing deadtime value\n");
+		return -1;
+	}
+
+	ret = parse_trigger_id(argv[0], &ent.id);
+	if (ret < 0)
+		return -1;
+
+	if (argv[1] != NULL) {
+		parse_delay(argv[1], &ts);
+		ent.ts = picos_to_ts(ts);
+	} else {
+		ent.ts.seconds = 0;
+		ent.ts.ticks = 100000000000ULL / 8000ULL; /* 100ms */
+		ent.ts.bins = 0;
+	}
+
+	return wrtd_in_trigger_software(wrtd, &ent);
 }

 int main(int argc, char *argv[])