X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flascar-el-usb%2Fprotocol.c;h=ac8b6ff9c4fe5f8e86806d71988366f2780b40b3;hb=ce19d4c6157b2998aa88a2f32670dd7bdcca02e8;hp=7916f05dd5e256a98a1c0c485568e6cc0b28a84e;hpb=1a46cc62e2b528bcaeb1f8dc0c952a81b3bcba5c;p=libsigrok.git

diff --git a/src/hardware/lascar-el-usb/protocol.c b/src/hardware/lascar-el-usb/protocol.c
index 7916f05d..ac8b6ff9 100644
--- a/src/hardware/lascar-el-usb/protocol.c
+++ b/src/hardware/lascar-el-usb/protocol.c
@@ -17,12 +17,13 @@
  * 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>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
@@ -77,7 +78,7 @@ static libusb_device_handle *lascar_open(struct libusb_device *dev)
 	return dev_hdl;
 }
 
-static void mark_xfer(struct libusb_transfer *xfer)
+static void LIBUSB_CALL mark_xfer(struct libusb_transfer *xfer)
 {
 
 	xfer->user_data = GINT_TO_POINTER(1);
@@ -96,7 +97,7 @@ SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl,
 
 	sr_spew("Reading config block.");
 
-	drvc = di->priv;
+	drvc = di->context;
 	*configlen = 0;
 
 	if (!(xfer_in = libusb_alloc_transfer(0)) ||
@@ -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)
@@ -213,7 +214,7 @@ static int lascar_save_config(libusb_device_handle *dev_hdl,
 
 	sr_spew("Writing config block.");
 
-	drvc = di->priv;
+	drvc = di->context;
 
 	if (!(xfer_in = libusb_alloc_transfer(0)) ||
 			!(xfer_out = libusb_alloc_transfer(0)))
@@ -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,21 +352,15 @@ 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->priv;
+	drvc = di->context;
 	sdi = NULL;
 
 	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;
@@ -479,7 +476,7 @@ 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->priv;
+	struct drv_context *drvc = di->context;
 	struct sr_datafeed_packet packet;
 	struct sr_dev_inst *sdi;
 	struct timeval tv;
@@ -503,7 +500,7 @@ SR_PRIV int lascar_el_usb_handle_events(int fd, int revents, void *cb_data)
 	return TRUE;
 }
 
-SR_PRIV void lascar_el_usb_receive_transfer(struct libusb_transfer *transfer)
+SR_PRIV void LIBUSB_CALL lascar_el_usb_receive_transfer(struct libusb_transfer *transfer)
 {
 	struct dev_context *devc;
 	struct sr_dev_inst *sdi;