lib: remove zio generic operations for acquisition start and stop

ZIO does not support start and stop, so it wrong to provide a common ZIO feature about this. Moreover, its usage in the FMC-ADC100M14B4CH device is buggy because it forces a flush while the acquisition is running; instead, we want to flush *before* starting the acquisition. Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

lib: remove zio generic operations for acquisition start and stop
ZIO does not support start and stop, so it wrong to provide a common ZIO feature about this. Moreover, its usage in the FMC-ADC100M14B4CH device is buggy because it forces a flush while the acquisition is running; instead, we want to flush *before* starting the acquisition. Signed-off-by: Federico Vaga <federico.vaga@cern.ch>
9f5a9acd · Federico Vaga · 3fcbbe75 · 9f5a9acd · 9f5a9acd · 9f5a9acd
Commit 9f5a9acd authored Aug 08, 2019 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 39 additions and 29 deletions

adc-lib-int.h lib/adc-lib-int.h +0 -6

adc-zio.c lib/adc-zio.c +0 -20

adc-ziofake.c lib/adc-ziofake.c +29 -2

fmc-adc-100m14b4cha.c lib/fmc-adc-100m14b4cha.c +10 -1

No files found.
--- a/lib/adc-lib-int.h
+++ b/lib/adc-lib-int.h
@@ -143,16 +143,10 @@ struct adc_dev *adc_zio_open(const struct adc_board_type *b,

 int adc_zio_close(struct adc_dev *dev);

-int adc_zio_acq_start(struct adc_dev *dev,
-			unsigned int flags,
-			struct timeval *timeout);
-
 int adc_zio_acq_poll(struct adc_dev *dev,
 			unsigned int flags,
 			struct timeval *timeout);

-int adc_zio_acq_stop(struct adc_dev *dev, unsigned int flags);
-
 int adc_zio_acq_flush(struct adc_dev *dev, unsigned int flags);

 struct adc_buffer *adc_zio_request_buffer(struct adc_dev *dev,

--- a/lib/adc-zio.c
+++ b/lib/adc-zio.c
@@ -167,26 +167,6 @@ int adc_zio_acq_poll(struct adc_dev *dev,
 	return 0;
 }

-int adc_zio_acq_start(struct adc_dev *dev,
-			 unsigned int flags, struct timeval *timeout)
-{
-	if (flags & ADC_F_FLUSH)
-		if (adc_acq_flush(dev, ADC_FLUSH_F_ANY) < 0)
-			return -1;
-
-
-	if (timeout && timeout->tv_sec == 0 && timeout->tv_usec == 0)
-		return 0;
-
-	return adc_zio_acq_poll(dev, flags, timeout);
-}
-
-int adc_zio_acq_stop(struct adc_dev *dev, unsigned int flags)
-{
-	/*A portable stop-command could be inserted here*/
-	return 0;
-}
-
 int adc_zio_acq_flush(struct adc_dev *dev, unsigned int flags)
 {
 	struct __adc_dev_zio *fa = to_dev_zio(dev);

--- a/lib/adc-ziofake.c
+++ b/lib/adc-ziofake.c
@@ -34,6 +34,32 @@ static struct adc_dev *adc_ziofake_open(const struct adc_board_type *b,
 	return dev;
 }

+static int adc_ziofake_acq_start(struct adc_dev *dev, unsigned int flags,
+				 struct timeval *timeout)
+{
+	if (flags & ADC_F_FLUSH) {
+		int err = adc_acq_flush(dev, ADC_FLUSH_F_ANY);
+		if (err)
+			return err;
+	}
+
+	if (timeout && timeout->tv_sec == 0 && timeout->tv_usec == 0)
+		return 0;
+
+	return adc_acq_poll(dev, 0, timeout);
+}
+
+static int adc_ziofake_acq_stop(struct adc_dev *dev, unsigned int flags)
+{
+	return 0;
+}
+
+static int adc_ziofake_acq_flush(struct adc_dev *dev, unsigned int flags)
+{
+	return adc_zio_acq_flush(dev, flags);
+}
+
+
 static int adc_ziofake_buffer_get_sample(struct adc_buffer *buf,
 					 unsigned int chan,
 					 unsigned int acq_sample,
@@ -62,9 +88,10 @@ static struct adc_operations fa_zio_fake_op = {
 	.open = 		adc_ziofake_open,
 	.close =		adc_zio_close,

-	.acq_start =		adc_zio_acq_start,
+	.acq_start =		adc_ziofake_acq_start,
 	.acq_poll =		adc_zio_acq_poll,
-	.acq_stop =		adc_zio_acq_stop,
+	.acq_stop =		adc_ziofake_acq_stop,
+	.acq_flush =		adc_ziofake_acq_flush,

 	.apply_config = 	adc_zio_apply_config,
 	.retrieve_config =	adc_zio_retrieve_config,

--- a/lib/fmc-adc-100m14b4cha.c
+++ b/lib/fmc-adc-100m14b4cha.c
@@ -219,6 +219,12 @@ static int adc_100m14b4cha_acq_start(struct adc_dev *dev,
 	int tmp = 1; /* enable the trigger */
 	int err;

+	if (flags & ADC_F_FLUSH) {
+		err = adc_acq_flush(dev, ADC_FLUSH_F_ANY);
+		if (err)
+			return err;
+	}
+
 	err = adc_set_param(dev, "cset0/trigger/enable", NULL, &tmp);
 	if (err)
 		return err;
@@ -226,7 +232,10 @@ static int adc_100m14b4cha_acq_start(struct adc_dev *dev,
 	if (err)
 		return err;

-	return adc_zio_acq_start(dev, flags, timeout);
+	if (timeout && timeout->tv_sec == 0 && timeout->tv_usec == 0)
+		return 0;
+
+	return adc_acq_poll(dev, 0, timeout);
 }