Fix various sample/time limit regressions.

[libsigrok.git] / src / hardware / manson-hcs-3xxx / api.c

diff --git a/src/hardware/manson-hcs-3xxx/api.c b/src/hardware/manson-hcs-3xxx/api.c
index c7394e361beeb531960159511802de1c8f4689b1..bc2700fa952ecca47fada9ce3ee67977c5f88e58 100644 (file)
--- a/src/hardware/manson-hcs-3xxx/api.c
+++ b/src/hardware/manson-hcs-3xxx/api.c
@@ -19,10 +19,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-/** @file
-  *  <em>Manson HCS-3xxx series</em> power supply driver
-  *  @internal
-  */
+/**
+ * @file
+ *
+ * <em>Manson HCS-3xxx series</em> power supply driver
+ *
+ * @internal
+ */
 
 #include <config.h>
 #include "protocol.h"
@@ -238,6 +241,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 
        switch (key) {
        case SR_CONF_LIMIT_MSEC:
+       case SR_CONF_LIMIT_SAMPLES:
                return sr_sw_limits_config_set(&devc->limits, key, data);
        case SR_CONF_VOLTAGE_TARGET:
                dval = g_variant_get_double(data);
@@ -369,12 +373,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi,
-                       std_serial_dev_close, sdi->conn);
-}
-
 static struct sr_dev_driver manson_hcs_3xxx_driver_info = {
        .name = "manson-hcs-3xxx",
        .longname = "Manson HCS-3xxx",
@@ -389,7 +387,7 @@ static struct sr_dev_driver manson_hcs_3xxx_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(manson_hcs_3xxx_driver_info);