Remove unnecessary std_serial_dev_acquisition_stop() wrappers

[libsigrok.git] / src / hardware / serial-dmm / protocol.h

diff --git a/src/hardware/serial-dmm/protocol.h b/src/hardware/serial-dmm/protocol.h
index 202eba2748f60ec6b0b34b92c02c198c02d9aee8..8c21f9d975847dcce16cde3eb5866cef45b70edb 100644 (file)
--- a/src/hardware/serial-dmm/protocol.h
+++ b/src/hardware/serial-dmm/protocol.h
@@ -26,11 +26,11 @@ struct dmm_info {
        /** libsigrok driver info struct. */
        struct sr_dev_driver di;
        /** Manufacturer/brand. */
-       char *vendor;
+       const char *vendor;
        /** Model. */
-       char *device;
+       const char *device;
        /** serialconn string. */
-       char *conn;
+       const char *conn;
        /** Baud rate. */
        uint32_t baudrate;
        /** Packet size in bytes. */
@@ -47,33 +47,18 @@ struct dmm_info {
        gboolean (*packet_valid)(const uint8_t *);
        /** Packet parsing function. */
        int (*packet_parse)(const uint8_t *, float *,
-                           struct sr_datafeed_analog *, void *);
+                           struct sr_datafeed_analog_old *, void *);
        /** */
-       void (*dmm_details)(struct sr_datafeed_analog *, void *);
+       void (*dmm_details)(struct sr_datafeed_analog_old *, void *);
        /** Size of chipset info struct. */
        gsize info_size;
 };
 
-extern SR_PRIV struct dmm_info *dmms[];
-
 #define DMM_BUFSIZE 256
 
 /** Private, per-device-instance driver context. */
 struct dev_context {
-       /** The current sampling limit (in number of samples). */
-       uint64_t limit_samples;
-
-       /** The time limit (in milliseconds). */
-       uint64_t limit_msec;
-
-       /** Opaque pointer passed in by the frontend. */
-       void *cb_data;
-
-       /** The current number of already received samples. */
-       uint64_t num_samples;
-
-       /** The starting time of current sampling run. */
-       int64_t starttime;
+       struct sr_sw_limits limits;
 
        uint8_t buf[DMM_BUFSIZE];
        int bufoffset;