dmm: Convert to SR_DF_ANALOG.

[libsigrok.git] / src / hardware / uni-t-ut32x / protocol.c

diff --git a/src/hardware/uni-t-ut32x/protocol.c b/src/hardware/uni-t-ut32x/protocol.c
index 14e70cf221ed13f9d41adf1082098ce215f8648e..0b4d2da2f763310f16305a4edd4593118c96d1fb 100644 (file)
--- a/src/hardware/uni-t-ut32x/protocol.c
+++ b/src/hardware/uni-t-ut32x/protocol.c
@@ -22,8 +22,6 @@
 #include <math.h>
 #include "protocol.h"
 
-extern struct sr_dev_driver uni_t_ut32x_driver_info;
-
 static float parse_temperature(unsigned char *buf)
 {
        float temp;
@@ -130,7 +128,7 @@ static void process_packet(struct sr_dev_inst *sdi)
                        analog.data = &temp;
                        packet.type = SR_DF_ANALOG_OLD;
                        packet.payload = &analog;
-                       sr_session_send(devc->cb_data, &packet);
+                       sr_session_send(sdi, &packet);
                        g_slist_free(analog.channels);
                }
        }
@@ -140,8 +138,7 @@ static void process_packet(struct sr_dev_inst *sdi)
         * memory slots come through as "----" measurements. */
        devc->num_samples++;
        if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
-               sdi->driver->dev_acquisition_stop((struct sr_dev_inst *)sdi,
-                               devc->cb_data);
+               sdi->driver->dev_acquisition_stop(sdi);
        }
 
 }
@@ -218,7 +215,7 @@ SR_PRIV int uni_t_ut32x_handle_events(int fd, int revents, void *cb_data)
 
        if (sdi->status == SR_ST_STOPPING) {
                usb_source_remove(sdi->session, drvc->sr_ctx);
-               std_session_send_df_header(cb_data, LOG_PREFIX);
+               std_session_send_df_end(sdi);
 
                /* Tell the device to stop sending USB packets. */
                usb = sdi->conn;