Constify a lot more items.

[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 1437773c502cfbbc30ddd9e1c8becec4f5d25981..ac8b6ff9c4fe5f8e86806d71988366f2780b40b3 100644 (file)
--- a/src/hardware/lascar-el-usb/protocol.c
+++ b/src/hardware/lascar-el-usb/protocol.c
@@ -352,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;
@@ -362,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;
@@ -389,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;
@@ -403,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)))
@@ -454,7 +448,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
                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;