X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flascar-el-usb%2Fprotocol.c;h=1b6a0ad55e5ddf60992a72607d0323129fff1efd;hb=bee2b0168c087676c1b365861d8c2d4714afa9b9;hp=bccf7b6a685f5ade06818816cd1d7207cc8539bf;hpb=96127d0feaf7333fba880c5bcf1267de6360e6a8;p=libsigrok.git
diff --git a/src/hardware/lascar-el-usb/protocol.c b/src/hardware/lascar-el-usb/protocol.c
index bccf7b6a..1b6a0ad5 100644
--- 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 .
*/
+#include
#include
#include
#include
@@ -26,7 +27,7 @@
#include "libsigrok-internal.h"
#include "protocol.h"
-extern struct sr_dev_driver lascar_el_usb_driver_info;
+extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
struct sr_dev_driver *di = &lascar_el_usb_driver_info;
static const struct elusb_profile profiles[] = {
@@ -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)
@@ -326,7 +327,6 @@ static struct sr_dev_inst *lascar_identify(unsigned char *config)
sdi->vendor = g_strdup(LASCAR_VENDOR);
sdi->model = g_strdup(profile->modelname);
sdi->version = g_strdup(firmware);
- sdi->driver = di;
if (profile->logformat == LOG_TEMP_RH) {
/* Model this as two channels: temperature and humidity. */
@@ -351,21 +351,19 @@ 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;
+ int ret;
unsigned char config[MAX_CONFIGBLOCK_SIZE];
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;
- }
+ ret = libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
+ if (ret < 0)
+ return NULL;
+ for (i = 0; devlist[i]; i++) {
if (libusb_get_bus_number(devlist[i]) != bus ||
libusb_get_device_address(devlist[i]) != address)
continue;
@@ -379,6 +377,7 @@ SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address)
libusb_close(dev_hdl);
sdi = lascar_identify(config);
}
+ libusb_free_device_list(devlist, 1);
return sdi;
}
@@ -388,7 +387,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 +401,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)))
@@ -435,7 +434,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);
}
@@ -445,7 +444,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);
}
@@ -453,7 +452,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;
@@ -468,7 +467,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:
@@ -482,7 +481,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;
@@ -493,9 +491,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);
}
memset(&tv, 0, sizeof(struct timeval));
@@ -519,7 +515,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 */
@@ -538,7 +534,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) {
@@ -548,7 +544,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