Factor out std_session_send_df_end() helper.

[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 0c7829f85c8d2069d04b999c6d2d34fa2f449fa3..14e70cf221ed13f9d41adf1082098ce215f8648e 100644 (file)
--- a/src/hardware/uni-t-ut32x/protocol.c
+++ b/src/hardware/uni-t-ut32x/protocol.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
 #include <math.h>
 #include "protocol.h"
@@ -61,7 +62,7 @@ static void process_packet(struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_analog analog;
+       struct sr_datafeed_analog_old analog;
        GString *spew;
        float temp;
        int i;
@@ -88,7 +89,7 @@ static void process_packet(struct sr_dev_inst *sdi)
                is_valid = FALSE;
 
        if (is_valid) {
-               memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+               memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
                analog.mq = SR_MQ_TEMPERATURE;
                analog.mqflags = 0;
                switch (devc->packet[5] - 0x30) {
@@ -127,7 +128,7 @@ static void process_packet(struct sr_dev_inst *sdi)
                if (is_valid) {
                        analog.num_samples = 1;
                        analog.data = &temp;
-                       packet.type = SR_DF_ANALOG;
+                       packet.type = SR_DF_ANALOG_OLD;
                        packet.payload = &analog;
                        sr_session_send(devc->cb_data, &packet);
                        g_slist_free(analog.channels);
@@ -194,7 +195,6 @@ SR_PRIV int uni_t_ut32x_handle_events(int fd, int revents, void *cb_data)
        struct dev_context *devc;
        struct sr_dev_driver *di;
        struct sr_dev_inst *sdi;
-       struct sr_datafeed_packet packet;
        struct sr_usb_dev_inst *usb;
        struct timeval tv;
        int len, ret;
@@ -218,8 +218,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);
-               packet.type = SR_DF_END;
-               sr_session_send(cb_data, &packet);
+               std_session_send_df_header(cb_data, LOG_PREFIX);
 
                /* Tell the device to stop sending USB packets. */
                usb = sdi->conn;