Remove unnecessary dev_clear() callbacks

[libsigrok.git] / src / hardware / uni-t-dmm / api.c

diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index 199ad6b5a617bed5a3a2b78d85c5414aea2103c6..7e55d857f253c0c6e8731eb323cb8e0330ef3a1b 100644 (file)
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <libsigrok/libsigrok.h>
@@ -45,11 +46,6 @@ static const uint32_t devopts[] = {
  * default of 2400 being used (which will not work with this DMM, of course).
  */
 
-static int dev_clear(const struct sr_dev_driver *di)
-{
-       return std_dev_clear(di, NULL);
-}
-
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
        return std_init(sr_ctx, di, LOG_PREFIX);
@@ -138,11 +134,6 @@ static int dev_close(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int cleanup(const struct sr_dev_driver *di)
-{
-       return dev_clear(di);
-}
-
 static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
@@ -188,17 +179,13 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        return SR_OK;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
 
        devc = sdi->priv;
-
-       devc->cb_data = cb_data;
-
        devc->starttime = g_get_monotonic_time();
 
-       /* Send header packet to the session bus. */
        std_session_send_df_header(sdi, LOG_PREFIX);
 
        sr_session_source_add(sdi->session, -1, 0, 10 /* poll_timeout */,
@@ -207,20 +194,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       struct sr_datafeed_packet packet;
-
-       (void)cb_data;
-
        sr_dbg("Stopping acquisition.");
-
-       /* Send end packet to the session bus. */
-       sr_dbg("Sending SR_DF_END.");
-       packet.type = SR_DF_END;
-       sr_session_send(sdi, &packet);
-
-       sr_session_source_remove(sdi->session, 0);
+       std_session_send_df_end(sdi, LOG_PREFIX);
+       sr_session_source_remove(sdi->session, -1);
 
        return SR_OK;
 }
@@ -233,10 +211,9 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
                        .longname = VENDOR " " MODEL, \
                        .api_version = 1, \
                        .init = init, \
-                       .cleanup = cleanup, \
+                       .cleanup = std_cleanup, \
                        .scan = scan, \
                        .dev_list = dev_list, \
-                       .dev_clear = dev_clear, \
                        .config_get = NULL, \
                        .config_set = config_set, \
                        .config_list = config_list, \
@@ -387,6 +364,24 @@ SR_PRIV const struct dmm_info *uni_t_dmm_drivers[] = {
                "Voltcraft", "VC-960", 2400, UT71X_PACKET_SIZE,
                sr_ut71x_packet_valid, sr_ut71x_parse, NULL
        ),
+       DMM(
+               "tenma-72-7730", ut71x,
+               "Tenma", "72-7730", 2400,
+               UT71X_PACKET_SIZE,
+               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
+       ),
+       DMM(
+               "tenma-72-7732", ut71x,
+               "Tenma", "72-7732", 2400,
+               UT71X_PACKET_SIZE,
+               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
+       ),
+       DMM(
+               "tenma-72-9380a", ut71x,
+               "Tenma", "72-9380A", 2400,
+               UT71X_PACKET_SIZE,
+               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
+       ),
        DMM(
                "tenma-72-7745", es519xx,
                "Tenma", "72-7745", 2400,