X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flascar-el-usb%2Fprotocol.c;h=49c5cd0a3687e3416c8585edd72c1634cca7e204;hb=102f12396660e0784134bccce5cc0679db325751;hp=54b88e01b5782c9901d0d496487f9d1965ea7fb4;hpb=69e19dd7691f86ac001469d1b319e1358e0d9778;p=libsigrok.git diff --git a/hardware/lascar-el-usb/protocol.c b/hardware/lascar-el-usb/protocol.c index 54b88e01..49c5cd0a 100644 --- a/hardware/lascar-el-usb/protocol.c +++ b/hardware/lascar-el-usb/protocol.c @@ -55,7 +55,7 @@ static const struct elusb_profile profiles[] = { }; -SR_PRIV libusb_device_handle *lascar_open(struct libusb_device *dev) +static libusb_device_handle *lascar_open(struct libusb_device *dev) { libusb_device_handle *dev_hdl; int ret; @@ -85,21 +85,24 @@ static void mark_xfer(struct libusb_transfer *xfer) } -SR_PRIV unsigned char *lascar_get_config(libusb_device_handle *dev_hdl) +SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl, + unsigned char *configblock, int *configlen) { struct drv_context *drvc; struct libusb_transfer *xfer_in, *xfer_out; struct timeval tv; int64_t start; int buflen; - unsigned char cmd[3], buf[256], *config; + unsigned char cmd[3], buf[MAX_CONFIGBLOCK_SIZE]; + + sr_spew("Reading config block."); drvc = di->priv; - config = NULL; + *configlen = 0; if (!(xfer_in = libusb_alloc_transfer(0)) || !(xfer_out = libusb_alloc_transfer(0))) - return NULL; + return SR_ERR; /* Flush anything the F321 still has queued. */ while (libusb_bulk_transfer(dev_hdl, LASCAR_EP_IN, buf, 256, &buflen, @@ -143,10 +146,10 @@ SR_PRIV unsigned char *lascar_get_config(libusb_device_handle *dev_hdl) } /* Got configuration structure header. */ - sr_dbg("response to config request: 0x%.2x 0x%.2x 0x%.2x ", + sr_spew("Response to config request: 0x%.2x 0x%.2x 0x%.2x ", buf[0], buf[1], buf[2]); buflen = buf[1] | (buf[2] << 8); - if (buf[0] != 0x02 || buflen > 256) { + if (buf[0] != 0x02 || buflen > MAX_CONFIGBLOCK_SIZE) { sr_dbg("Invalid response to config request: " "0x%.2x 0x%.2x 0x%.2x ", buf[0], buf[1], buf[2]); libusb_close(dev_hdl); @@ -176,9 +179,8 @@ SR_PRIV unsigned char *lascar_get_config(libusb_device_handle *dev_hdl) goto cleanup; } - if (!(config = g_try_malloc(256))) - return NULL; - memcpy(config, buf, buflen); + memcpy(configblock, buf, buflen); + *configlen = buflen; cleanup: if (!xfer_in->user_data || !xfer_in->user_data) { @@ -197,11 +199,10 @@ cleanup: libusb_free_transfer(xfer_in); libusb_free_transfer(xfer_out); - return config; + return *configlen ? SR_OK : SR_ERR; } -/* Currently unused. */ -SR_PRIV int lascar_save_config(libusb_device_handle *dev_hdl, +static int lascar_save_config(libusb_device_handle *dev_hdl, unsigned char *config, int configlen) { struct drv_context *drvc; @@ -211,6 +212,8 @@ SR_PRIV int lascar_save_config(libusb_device_handle *dev_hdl, int buflen, ret; unsigned char cmd[3], buf[256]; + sr_spew("Writing config block."); + drvc = di->priv; if (!(xfer_in = libusb_alloc_transfer(0)) || @@ -290,7 +293,7 @@ static struct sr_dev_inst *lascar_identify(unsigned char *config) struct dev_context *devc; const struct elusb_profile *profile; struct sr_dev_inst *sdi; - struct sr_probe *probe; + struct sr_channel *ch; int modelid, i; char firmware[5]; @@ -325,9 +328,23 @@ static struct sr_dev_inst *lascar_identify(unsigned char *config) return NULL; sdi->driver = di; - if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1"))) - return NULL; - sdi->probes = g_slist_append(NULL, probe); + if (profile->logformat == LOG_TEMP_RH) { + /* Model this as two channels: temperature and humidity. */ + if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "Temp"))) + return NULL; + sdi->channels = g_slist_append(NULL, ch); + if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "Hum"))) + return NULL; + sdi->channels = g_slist_append(sdi->channels, ch); + } else if (profile->logformat == LOG_CO) { + if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "CO"))) + return NULL; + sdi->channels = g_slist_append(NULL, ch); + } else { + if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1"))) + return NULL; + sdi->channels = g_slist_append(NULL, ch); + } if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) return NULL; @@ -345,8 +362,8 @@ SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address) struct libusb_device **devlist; struct libusb_device_descriptor des; libusb_device_handle *dev_hdl; - int ret, i; - unsigned char *config; + int dummy, ret, i; + unsigned char config[MAX_CONFIGBLOCK_SIZE]; drvc = di->priv; sdi = NULL; @@ -365,12 +382,11 @@ SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address) if (!(dev_hdl = lascar_open(devlist[i]))) continue; - if (!(config = lascar_get_config(dev_hdl))) + if (lascar_get_config(dev_hdl, config, &dummy) != SR_OK) continue; libusb_close(dev_hdl); sdi = lascar_identify(config); - g_free(config); } return sdi; @@ -382,12 +398,12 @@ 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_channel *ch; float *temp, *rh; uint16_t s; int samples, samples_left, i, j; devc = sdi->priv; - analog.probes = sdi->probes; samples = buflen / devc->sample_size; samples_left = devc->logged_samples - devc->rcvd_samples; @@ -419,24 +435,34 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf, } analog.num_samples = j; - 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); + 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); + } + + 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.mq = SR_MQ_RELATIVE_HUMIDITY; - analog.unit = SR_UNIT_PERCENTAGE; - analog.data = rh; - sr_session_send(devc->cb_data, &packet); g_free(temp); g_free(rh); break; case LOG_CO: packet.type = SR_DF_ANALOG; packet.payload = &analog; + analog.channels = sdi->channels; analog.num_samples = samples; analog.mq = SR_MQ_CARBON_MONOXIDE; analog.unit = SR_UNIT_CONCENTRATION; @@ -462,24 +488,18 @@ 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 dev_context *devc; struct drv_context *drvc = di->priv; struct sr_datafeed_packet packet; struct sr_dev_inst *sdi; struct timeval tv; - int i; (void)fd; (void)revents; sdi = cb_data; - devc = sdi->priv; if (sdi->status == SR_ST_STOPPING) { - for (i = 0; devc->usbfd[i] != -1; i++) - sr_source_remove(devc->usbfd[i]); - - sdi->driver->dev_close(sdi); + usb_source_remove(sdi->session, drvc->sr_ctx); packet.type = SR_DF_END; sr_session_send(cb_data, &packet); @@ -506,7 +526,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. */ - hw_dev_acquisition_stop(sdi, sdi); + dev_acquisition_stop(sdi, sdi); return; case LIBUSB_TRANSFER_COMPLETED: case LIBUSB_TRANSFER_TIMED_OUT: /* We may have received some data though */ @@ -525,7 +545,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) - hw_dev_acquisition_stop(sdi, sdi); + dev_acquisition_stop(sdi, sdi); } if (sdi->status == SR_ST_ACTIVE) { @@ -535,7 +555,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); - hw_dev_acquisition_stop(sdi, sdi); + dev_acquisition_stop(sdi, sdi); } } else { /* This was the last transfer we're going to receive, so @@ -545,3 +565,92 @@ SR_PRIV void lascar_el_usb_receive_transfer(struct libusb_transfer *transfer) } } + +static int get_flags(unsigned char *configblock) +{ + int flags; + + flags = (configblock[32] | (configblock[33] << 8)) & 0x1fff; + sr_spew("Read flags (0x%.4x).", flags); + + return flags; +} + +static int set_flags(unsigned char *configblock, int flags) +{ + + sr_spew("Setting flags to 0x%.4x.", flags); + configblock[32] = flags & 0xff; + configblock[33] = (flags >> 8) & 0x1f; + + return flags; +} + +SR_PRIV int lascar_is_logging(const struct sr_dev_inst *sdi) +{ + struct dev_context *devc; + struct sr_usb_dev_inst *usb; + int dummy, flags, ret; + + devc = sdi->priv; + usb = sdi->conn; + + if (lascar_get_config(usb->devhdl, devc->config, &dummy) != SR_OK) + return -1; + + flags = get_flags(devc->config); + if (flags & 0x0100) + ret = 1; + else + ret = 0; + + return ret; +} + +SR_PRIV int lascar_start_logging(const struct sr_dev_inst *sdi) +{ + struct dev_context *devc; + struct sr_usb_dev_inst *usb; + int len, flags, ret; + + devc = sdi->priv; + usb = sdi->conn; + + if (lascar_get_config(usb->devhdl, devc->config, &len) != SR_OK) + return SR_ERR; + + /* Turn on logging. */ + flags = get_flags(devc->config); + flags |= 0x0100; + set_flags(devc->config, flags); + + /* Start logging in 0 seconds. */ + memset(devc->config + 24, 0, 4); + + ret = lascar_save_config(usb->devhdl, devc->config, len); + sr_info("Started internal logging."); + + return ret; +} + +SR_PRIV int lascar_stop_logging(const struct sr_dev_inst *sdi) +{ + struct dev_context *devc; + struct sr_usb_dev_inst *usb; + int len, flags, ret; + + devc = sdi->priv; + usb = sdi->conn; + + if (lascar_get_config(usb->devhdl, devc->config, &len) != SR_OK) + return SR_ERR; + + flags = get_flags(devc->config); + flags &= ~0x0100; + set_flags(devc->config, flags); + + ret = lascar_save_config(usb->devhdl, devc->config, len); + sr_info("Stopped internal logging."); + + return ret; +}