X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flascar-el-usb%2Fprotocol.c;h=44f4be82f350cca5d1e33b4d03c5c5fef8cb3a20;hb=3782e57129fa661a773be337c9f548708f593eb0;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..44f4be82 100644
--- a/src/hardware/lascar-el-usb/protocol.c
+++ b/src/hardware/lascar-el-usb/protocol.c
@@ -17,16 +17,17 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
#include
#include
-#include "libsigrok.h"
+#include
#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)
@@ -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)
@@ -297,52 +298,53 @@ static struct sr_dev_inst *lascar_identify(unsigned char *config)
modelid = config[0];
sdi = NULL;
- if (modelid) {
- profile = NULL;
- for (i = 0; profiles[i].modelid; i++) {
- if (profiles[i].modelid == modelid) {
- profile = &profiles[i];
- break;
- }
- }
- if (!profile) {
- sr_dbg("unknown EL-USB modelid %d", modelid);
- return NULL;
- }
- i = config[52] | (config[53] << 8);
- memcpy(firmware, config + 0x30, 4);
- firmware[4] = '\0';
- sr_dbg("found %s with firmware version %s serial %d",
- profile->modelname, firmware, i);
+ if (!modelid)
+ return sdi;
- if (profile->logformat == LOG_UNSUPPORTED) {
- sr_dbg("unsupported EL-USB logformat for %s", profile->modelname);
- return NULL;
+ profile = NULL;
+ for (i = 0; profiles[i].modelid; i++) {
+ if (profiles[i].modelid == modelid) {
+ profile = &profiles[i];
+ break;
}
+ }
+ if (!profile) {
+ sr_dbg("unknown EL-USB modelid %d", modelid);
+ return NULL;
+ }
- sdi = g_malloc0(sizeof(struct sr_dev_inst));
- sdi->status = SR_ST_INACTIVE;
- 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. */
- sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "Temp");
- sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "Hum");
- } else if (profile->logformat == LOG_CO) {
- sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "CO");
- } else {
- sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
- }
+ i = config[52] | (config[53] << 8);
+ memcpy(firmware, config + 0x30, 4);
+ firmware[4] = '\0';
+ sr_dbg("found %s with firmware version %s serial %d",
+ profile->modelname, firmware, i);
+
+ if (profile->logformat == LOG_UNSUPPORTED) {
+ sr_dbg("unsupported EL-USB logformat for %s", profile->modelname);
+ return NULL;
+ }
- devc = g_malloc0(sizeof(struct dev_context));
- sdi->priv = devc;
- devc->profile = profile;
+ sdi = g_malloc0(sizeof(struct sr_dev_inst));
+ sdi->status = SR_ST_INACTIVE;
+ sdi->vendor = g_strdup("Lascar");
+ sdi->model = g_strdup(profile->modelname);
+ sdi->version = g_strdup(firmware);
+
+ if (profile->logformat == LOG_TEMP_RH) {
+ /* Model this as two channels: temperature and humidity. */
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "Temp");
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "Hum");
+ } else if (profile->logformat == LOG_CO) {
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "CO");
+ } else {
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
}
+ devc = g_malloc0(sizeof(struct dev_context));
+ sdi->priv = devc;
+ devc->profile = profile;
+
return sdi;
}
@@ -351,21 +353,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->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;
- }
+ 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 +379,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;
}
@@ -389,6 +390,9 @@ 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_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
struct sr_channel *ch;
float *temp, *rh;
uint16_t s;
@@ -396,6 +400,9 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
devc = sdi->priv;
+ /* Note: digits/spec_digits will be overridden later. */
+ sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+
samples = buflen / devc->sample_size;
samples_left = devc->logged_samples - devc->rcvd_samples;
if (samples_left < samples)
@@ -404,7 +411,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
case LOG_TEMP_RH:
packet.type = SR_DF_ANALOG;
packet.payload = &analog;
- analog.mqflags = 0;
+ analog.meaning->mqflags = 0;
if (!(temp = g_try_malloc(sizeof(float) * samples)))
break;
if (!(rh = g_try_malloc(sizeof(float) * samples)))
@@ -428,23 +435,32 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
ch = sdi->channels->data;
if (ch->enabled) {
- analog.channels = g_slist_append(NULL, ch);
- analog.mq = SR_MQ_TEMPERATURE;
- if (devc->temp_unit == 1)
- analog.unit = SR_UNIT_FAHRENHEIT;
- else
- analog.unit = SR_UNIT_CELSIUS;
- analog.data = temp;
- sr_session_send(devc->cb_data, &packet);
+ analog.meaning->channels = g_slist_append(NULL, ch);
+ analog.meaning->mq = SR_MQ_TEMPERATURE;
+ if (devc->temp_unit == 1) {
+ analog.meaning->unit = SR_UNIT_FAHRENHEIT;
+ analog.encoding->digits = 0;
+ analog.spec->spec_digits = 0;
+ } else {
+ analog.meaning->unit = SR_UNIT_CELSIUS;
+ analog.encoding->digits = 1;
+ analog.spec->spec_digits = 1;
+ }
+ analog.data = (void *)temp;
+ sr_session_send(sdi, &packet);
+ g_slist_free(analog.meaning->channels);
}
ch = sdi->channels->next->data;
if (ch->enabled) {
- analog.channels = g_slist_append(NULL, ch);
- analog.mq = SR_MQ_RELATIVE_HUMIDITY;
- analog.unit = SR_UNIT_PERCENTAGE;
- analog.data = rh;
- sr_session_send(devc->cb_data, &packet);
+ analog.meaning->channels = g_slist_append(NULL, ch);
+ analog.meaning->mq = SR_MQ_RELATIVE_HUMIDITY;
+ analog.meaning->unit = SR_UNIT_PERCENTAGE;
+ analog.encoding->digits = 1;
+ analog.spec->spec_digits = 1;
+ analog.data = (void *)rh;
+ sr_session_send(sdi, &packet);
+ g_slist_free(analog.meaning->channels);
}
g_free(temp);
@@ -453,20 +469,20 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
case LOG_CO:
packet.type = SR_DF_ANALOG;
packet.payload = &analog;
- analog.channels = sdi->channels;
+ analog.meaning->channels = sdi->channels;
analog.num_samples = samples;
- analog.mq = SR_MQ_CARBON_MONOXIDE;
- analog.unit = SR_UNIT_CONCENTRATION;
- analog.mqflags = 0;
+ analog.meaning->mq = SR_MQ_CARBON_MONOXIDE;
+ analog.meaning->unit = SR_UNIT_CONCENTRATION;
+ analog.meaning->mqflags = 0;
if (!(analog.data = g_try_malloc(sizeof(float) * samples)))
break;
for (i = 0; i < samples; i++) {
s = (buf[i * 2] << 8) | buf[i * 2 + 1];
- analog.data[i] = (s * devc->co_high + devc->co_low) / (1000 * 1000);
- if (analog.data[i] < 0.0)
- analog.data[i] = 0.0;
+ ((float *)analog.data)[i] = (s * devc->co_high + devc->co_low) / (1000 * 1000);
+ if (((float *)analog.data)[i] < 0.0)
+ ((float *)analog.data)[i] = 0.0;
}
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
g_free(analog.data);
break;
default:
@@ -479,8 +495,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 sr_datafeed_packet packet;
+ struct drv_context *drvc = di->context;
struct sr_dev_inst *sdi;
struct timeval tv;
@@ -491,9 +506,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));
@@ -503,7 +516,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;
@@ -517,7 +530,7 @@ SR_PRIV void lascar_el_usb_receive_transfer(struct libusb_transfer *transfer)
switch (transfer->status) {
case LIBUSB_TRANSFER_NO_DEVICE:
/* USB device was unplugged. */
- dev_acquisition_stop(sdi, sdi);
+ sr_dev_acquisition_stop(sdi);
return;
case LIBUSB_TRANSFER_COMPLETED:
case LIBUSB_TRANSFER_TIMED_OUT: /* We may have received some data though */
@@ -536,7 +549,7 @@ SR_PRIV void lascar_el_usb_receive_transfer(struct libusb_transfer *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);
+ sr_dev_acquisition_stop(sdi);
}
if (sdi->status == SR_ST_ACTIVE) {
@@ -546,7 +559,7 @@ SR_PRIV void lascar_el_usb_receive_transfer(struct libusb_transfer *transfer)
libusb_error_name(ret));
g_free(transfer->buffer);
libusb_free_transfer(transfer);
- dev_acquisition_stop(sdi, sdi);
+ sr_dev_acquisition_stop(sdi);
}
} else {
/* This was the last transfer we're going to receive, so