lib: subtract offsets in configuration readback

To get the output configuration, a simple readback of the sysfs start/end/delta parameters is not enough, because start and end are affected by delay-offset and the tdc offset. This patch addresses the problem in an incomplete manner

lib: subtract offsets in configuration readback
To get the output configuration, a simple readback of the sysfs start/end/delta parameters is not enough, because start and end are affected by delay-offset and the tdc offset. This patch addresses the problem in an incomplete manner
f9756f73 · Juan David González Cobas · Alessandro Rubini · 391d7d16 · f9756f73
Commit f9756f73 authored Nov 11, 2013 by Juan David González Cobas Committed by Alessandro Rubini Mar 18, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 0 deletions

fdelay-output.c lib/fdelay-output.c +11 -0

No files found.
--- a/lib/fdelay-output.c
+++ b/lib/fdelay-output.c
@@ -210,7 +210,11 @@ static void fdelay_subtract_ps(struct fdelay_time *t2,
 int fdelay_get_config_pulse_ps(struct fdelay_board *userb,
 			       int channel, struct fdelay_pulse_ps *ps)
 {
+	__define_board(b, userb);
 	struct fdelay_pulse pulse;
+	char s[32];
+	uint32_t delay_offset;
+	uint32_t offset;

 	if (fdelay_get_config_pulse(userb, channel, &pulse) < 0)
 		return -1;
@@ -221,6 +225,13 @@ int fdelay_get_config_pulse_ps(struct fdelay_board *userb,
 	fdelay_subtract_ps(&pulse.end, &pulse.start, (int64_t *)&ps->length);
 	fdelay_time_to_pico(&pulse.loop, &ps->period);

+	sprintf(s,"fd-ch%i/%s", channel + 1, "delay-offset");
+	if (fdelay_sysfs_get(b, s, &delay_offset) < 0)
+		return -1;
+	if (fdelay_sysfs_get(b, "fd-input/offset", &offset) < 0)
+		return -1;
+	ps->length -= delay_offset + offset;
+
 	return 0;
 }
 int fdelay_has_triggered(struct fdelay_board *userb, int channel)