X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flascar-el-usb%2Fprotocol.c;h=e4fae68f5720d4df39e9fbac0d3001d94d43274a;hb=1e726f568d6d72a8c6afdcd8fa98b98e910ad523;hp=24e85e5c54918466bce107b08697bfa9157e1fba;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git

diff --git a/src/hardware/lascar-el-usb/protocol.c b/src/hardware/lascar-el-usb/protocol.c
index 24e85e5c..e4fae68f 100644
--- a/src/hardware/lascar-el-usb/protocol.c
+++ b/src/hardware/lascar-el-usb/protocol.c
@@ -52,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)
@@ -183,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)
@@ -269,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)
@@ -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)))
@@ -436,7 +430,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
 			else
 				analog.unit = SR_UNIT_CELSIUS;
 			analog.data = temp;
-			sr_session_send(devc->cb_data, &packet);
+			sr_session_send(sdi, &packet);
 			g_slist_free(analog.channels);
 		}
 
@@ -446,7 +440,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
 			analog.mq = SR_MQ_RELATIVE_HUMIDITY;
 			analog.unit = SR_UNIT_PERCENTAGE;
 			analog.data = rh;
-			sr_session_send(devc->cb_data, &packet);
+			sr_session_send(sdi, &packet);
 			g_slist_free(analog.channels);
 		}
 
@@ -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;
@@ -469,7 +463,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
 			if (analog.data[i] < 0.0)
 				analog.data[i] = 0.0;
 		}
-		sr_session_send(devc->cb_data, &packet);
+		sr_session_send(sdi, &packet);
 		g_free(analog.data);
 		break;
 	default:
@@ -483,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;
 
@@ -494,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(sdi, LOG_PREFIX);
 	}
 
 	memset(&tv, 0, sizeof(struct timeval));
@@ -520,7 +511,7 @@ SR_PRIV void LIBUSB_CALL lascar_el_usb_receive_transfer(struct libusb_transfer *
 	switch (transfer->status) {
 	case LIBUSB_TRANSFER_NO_DEVICE:
 		/* USB device was unplugged. */
-		dev_acquisition_stop(sdi, sdi);
+		dev_acquisition_stop(sdi);
 		return;
 	case LIBUSB_TRANSFER_COMPLETED:
 	case LIBUSB_TRANSFER_TIMED_OUT: /* We may have received some data though */
@@ -539,7 +530,7 @@ SR_PRIV void LIBUSB_CALL lascar_el_usb_receive_transfer(struct libusb_transfer *
 				devc->rcvd_bytes, devc->log_size,
 				devc->rcvd_samples, devc->logged_samples);
 		if (devc->rcvd_bytes >= devc->log_size)
-			dev_acquisition_stop(sdi, sdi);
+			dev_acquisition_stop(sdi);
 	}
 
 	if (sdi->status == SR_ST_ACTIVE) {
@@ -549,7 +540,7 @@ SR_PRIV void LIBUSB_CALL lascar_el_usb_receive_transfer(struct libusb_transfer *
 			       libusb_error_name(ret));
 			g_free(transfer->buffer);
 			libusb_free_transfer(transfer);
-			dev_acquisition_stop(sdi, sdi);
+			dev_acquisition_stop(sdi);
 		}
 	} else {
 		/* This was the last transfer we're going to receive, so