* 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>
{ 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)
*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)
}
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)
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;
libusb_close(dev_hdl);
sdi = lascar_identify(config);
}
+ libusb_free_device_list(devlist, 1);
return sdi;
}
{
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;
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)))
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);
}
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);
}
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;
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:
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;
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));
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 */
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) {
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