Factor out std_session_send_df_end() helper.

[libsigrok.git] / src / hardware / lascar-el-usb / protocol.c

diff --git a/src/hardware/lascar-el-usb/protocol.c b/src/hardware/lascar-el-usb/protocol.c
index ba60fe3bc95fa82434e9d1dd353f9a20c96f140d..9fd9b696466a09eac8921d0d26c263bde7b46d10 100644 (file)
--- a/src/hardware/lascar-el-usb/protocol.c
+++ b/src/hardware/lascar-el-usb/protocol.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <string.h>
@@ -51,7 +52,7 @@ static const struct elusb_profile profiles[] = {
        { 19, "EL-USB-1-LCD", LOG_UNSUPPORTED },
        { 20, "EL-OEM-3", LOG_UNSUPPORTED },
        { 21, "EL-USB-1-LCD", LOG_UNSUPPORTED },
-       { 0, NULL, 0 }
+       ALL_ZERO
 };
 
 static libusb_device_handle *lascar_open(struct libusb_device *dev)
@@ -182,7 +183,7 @@ SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl,
        *configlen = buflen;
 
 cleanup:
-       if (!xfer_in->user_data || !xfer_in->user_data) {
+       if (!xfer_in->user_data || !xfer_out->user_data) {
                if (!xfer_in->user_data)
                        libusb_cancel_transfer(xfer_in);
                if (!xfer_out->user_data)
@@ -268,7 +269,7 @@ static int lascar_save_config(libusb_device_handle *dev_hdl,
        }
 
 cleanup:
-       if (!xfer_in->user_data || !xfer_in->user_data) {
+       if (!xfer_in->user_data || !xfer_out->user_data) {
                if (!xfer_in->user_data)
                        libusb_cancel_transfer(xfer_in);
                if (!xfer_out->user_data)
@@ -351,9 +352,8 @@ SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address)
        struct drv_context *drvc;
        struct sr_dev_inst *sdi;
        struct libusb_device **devlist;
-       struct libusb_device_descriptor des;
        libusb_device_handle *dev_hdl;
-       int dummy, ret, i;
+       int dummy, i;
        unsigned char config[MAX_CONFIGBLOCK_SIZE];
 
        drvc = di->context;
@@ -361,11 +361,6 @@ SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address)
 
        libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
        for (i = 0; devlist[i]; i++) {
-               if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
-                       sr_err("Failed to get device descriptor: %d.", ret);
-                       continue;
-               }
-
                if (libusb_get_bus_number(devlist[i]) != bus ||
                                libusb_get_device_address(devlist[i]) != address)
                        continue;
@@ -388,7 +383,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
 {
        struct dev_context *devc;
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_analog analog;
+       struct sr_datafeed_analog_old analog;
        struct sr_channel *ch;
        float *temp, *rh;
        uint16_t s;
@@ -402,7 +397,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
                samples = samples_left;
        switch (devc->profile->logformat) {
        case LOG_TEMP_RH:
-               packet.type = SR_DF_ANALOG;
+               packet.type = SR_DF_ANALOG_OLD;
                packet.payload = &analog;
                analog.mqflags = 0;
                if (!(temp = g_try_malloc(sizeof(float) * samples)))
@@ -436,6 +431,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
                                analog.unit = SR_UNIT_CELSIUS;
                        analog.data = temp;
                        sr_session_send(devc->cb_data, &packet);
+                       g_slist_free(analog.channels);
                }
 
                ch = sdi->channels->next->data;
@@ -445,13 +441,14 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
                        analog.unit = SR_UNIT_PERCENTAGE;
                        analog.data = rh;
                        sr_session_send(devc->cb_data, &packet);
+                       g_slist_free(analog.channels);
                }
 
                g_free(temp);
                g_free(rh);
                break;
        case LOG_CO:
-               packet.type = SR_DF_ANALOG;
+               packet.type = SR_DF_ANALOG_OLD;
                packet.payload = &analog;
                analog.channels = sdi->channels;
                analog.num_samples = samples;
@@ -480,7 +477,6 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
 SR_PRIV int lascar_el_usb_handle_events(int fd, int revents, void *cb_data)
 {
        struct drv_context *drvc = di->context;
-       struct sr_datafeed_packet packet;
        struct sr_dev_inst *sdi;
        struct timeval tv;
 
@@ -491,9 +487,7 @@ SR_PRIV int lascar_el_usb_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_end(cb_data, LOG_PREFIX);
        }
 
        memset(&tv, 0, sizeof(struct timeval));