/*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
*
* Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
*
#define NUM_TIMEBASE 10
#define NUM_VDIV 8
+static const int32_t scanopts[] = {
+ SR_CONF_CONN,
+};
+
static const int32_t devopts[] = {
SR_CONF_OSCILLOSCOPE,
SR_CONF_LIMIT_FRAMES,
return SR_OK;
}
-/* Properly close and free all devices. */
-static int clear_instances(void)
+static void clear_dev_context(void *priv)
{
- struct sr_dev_inst *sdi;
- struct drv_context *drvc;
struct dev_context *devc;
- GSList *l;
-
- drvc = di->priv;
- for (l = drvc->instances; l; l = l->next) {
- if (!(sdi = l->data)) {
- /* Log error, but continue cleaning up the rest. */
- sr_err("%s: sdi was NULL, continuing", __func__);
- continue;
- }
- if (!(devc = sdi->priv)) {
- /* Log error, but continue cleaning up the rest. */
- sr_err("%s: sdi->priv was NULL, continuing", __func__);
- continue;
- }
- dso_close(sdi);
- sr_usb_dev_inst_free(devc->usb);
- g_free(devc->triggersource);
- g_slist_free(devc->enabled_probes);
- sr_dev_inst_free(sdi);
- }
+ devc = priv;
+ g_free(devc->triggersource);
+ g_slist_free(devc->enabled_probes);
- g_slist_free(drvc->instances);
- drvc->instances = NULL;
+}
- return SR_OK;
+static int clear_instances(void)
+{
+ return std_dev_clear(di, clear_dev_context);
}
static int hw_init(struct sr_context *sr_ctx)
static GSList *hw_scan(GSList *options)
{
- struct sr_dev_inst *sdi;
- const struct dso_profile *prof;
struct drv_context *drvc;
struct dev_context *devc;
- GSList *devices;
+ struct sr_dev_inst *sdi;
+ struct sr_usb_dev_inst *usb;
+ struct sr_config *src;
+ const struct dso_profile *prof;
+ GSList *l, *devices, *conn_devices;
struct libusb_device_descriptor des;
libusb_device **devlist;
int devcnt, ret, i, j;
-
- (void)options;
+ const char *conn;
drvc = di->priv;
drvc->instances = NULL;
clear_instances();
+ conn = NULL;
+ for (l = options; l; l = l->next) {
+ src = l->data;
+ if (src->key == SR_CONF_CONN) {
+ conn = g_variant_get_string(src->data, NULL);
+ break;
+ }
+ }
+ if (conn)
+ conn_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn);
+ else
+ conn_devices = NULL;
+
/* Find all Hantek DSO devices and upload firmware to all of them. */
libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
for (i = 0; devlist[i]; i++) {
+ if (conn) {
+ usb = NULL;
+ for (l = conn_devices; l; l = l->next) {
+ usb = l->data;
+ if (usb->bus == libusb_get_bus_number(devlist[i])
+ && usb->address == libusb_get_device_address(devlist[i]))
+ break;
+ }
+ if (!l)
+ /* This device matched none of the ones that
+ * matched the conn specification. */
+ continue;
+ }
+
if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
sr_err("Failed to get device descriptor: %s.",
- libusb_error_name(ret));
+ libusb_error_name(ret));
continue;
}
devc->fw_updated = g_get_monotonic_time();
else
sr_err("Firmware upload failed for "
- "device %d.", devcnt);
+ "device %d.", devcnt);
/* Dummy USB address of 0xff will get overwritten later. */
- devc->usb = sr_usb_dev_inst_new(
+ sdi->conn = sr_usb_dev_inst_new(
libusb_get_bus_number(devlist[i]), 0xff, NULL);
devcnt++;
break;
sdi->status = SR_ST_INACTIVE;
devices = g_slist_append(devices, sdi);
devc = sdi->priv;
- devc->usb = sr_usb_dev_inst_new(
+ sdi->inst_type = SR_INST_USB;
+ sdi->conn = sr_usb_dev_inst_new(
libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL);
devcnt++;
static int hw_dev_open(struct sr_dev_inst *sdi)
{
struct dev_context *devc;
+ struct sr_usb_dev_inst *usb;
int64_t timediff_us, timediff_ms;
int err;
devc = sdi->priv;
+ usb = sdi->conn;
/*
* If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS
return SR_ERR;
}
- err = libusb_claim_interface(devc->usb->devhdl, USB_INTERFACE);
+ err = libusb_claim_interface(usb->devhdl, USB_INTERFACE);
if (err != 0) {
sr_err("Unable to claim interface: %s.",
- libusb_error_name(err));
+ libusb_error_name(err));
return SR_ERR;
}
static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
{
-
- (void)sdi;
+ struct sr_usb_dev_inst *usb;
+ char str[128];
switch (id) {
+ case SR_CONF_CONN:
+ if (!sdi || !sdi->conn)
+ return SR_ERR_ARG;
+ usb = sdi->conn;
+ if (usb->address == 255)
+ /* Device still needs to re-enumerate after firmware
+ * upload, so we don't know its (future) address. */
+ return SR_ERR;
+ snprintf(str, 128, "%d.%d", usb->bus, usb->address);
+ *data = g_variant_new_string(str);
+ break;
case SR_CONF_NUM_TIMEBASE:
*data = g_variant_new_int32(NUM_TIMEBASE);
break;
*data = g_variant_new_int32(NUM_VDIV);
break;
default:
- return SR_ERR_ARG;
+ return SR_ERR_NA;
}
return SR_OK;
char **targets;
if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR;
+ return SR_ERR_DEV_CLOSED;
ret = SR_OK;
devc = sdi->priv;
ret = SR_ERR_ARG;
break;
default:
- ret = SR_ERR_ARG;
+ ret = SR_ERR_NA;
break;
}
devc = sdi->priv;
switch (key) {
+ case SR_CONF_SCAN_OPTIONS:
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+ scanopts, ARRAY_SIZE(scanopts), sizeof(int32_t));
+ break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
devopts, ARRAY_SIZE(devopts), sizeof(int32_t));
ARRAY_SIZE(trigger_sources));
break;
default:
- return SR_ERR_ARG;
+ return SR_ERR_NA;
}
return SR_OK;
sdi = transfer->user_data;
devc = sdi->priv;
sr_spew("receive_transfer(): status %d received %d bytes.",
- transfer->status, transfer->actual_length);
+ transfer->status, transfer->actual_length);
if (transfer->actual_length == 0)
/* Nothing to send to the bus. */
num_samples = transfer->actual_length / 2;
sr_spew("Got %d-%d/%d samples in frame.", devc->samp_received + 1,
- devc->samp_received + num_samples, devc->framesize);
+ devc->samp_received + num_samples, devc->framesize);
/*
* The device always sends a full frame, but the beginning of the frame
/* The rest of this chunk starts with the trigger point. */
sr_dbg("Reached trigger point, %d samples buffered.",
- devc->samp_buffered);
+ devc->samp_buffered);
/* Avoid the corner case where the chunk ended at
* exactly the trigger point. */
/* That was the last chunk in this frame. Send the buffered
* pre-trigger samples out now, in one big chunk. */
sr_dbg("End of frame, sending %d pre-trigger buffered samples.",
- devc->samp_buffered);
+ devc->samp_buffered);
send_chunk(sdi, devc->framebuf, devc->samp_buffered);
/* Mark the end of this frame. */
/* TODO: ugh */
if (devc->dev_state == NEW_CAPTURE) {
- if (dso_capture_start(devc) != SR_OK)
+ if (dso_capture_start(sdi) != SR_OK)
return TRUE;
- if (dso_enable_trigger(devc) != SR_OK)
+ if (dso_enable_trigger(sdi) != SR_OK)
return TRUE;
-// if (dso_force_trigger(devc) != SR_OK)
+// if (dso_force_trigger(sdi) != SR_OK)
// return TRUE;
sr_dbg("Successfully requested next chunk.");
devc->dev_state = CAPTURE;
if (devc->dev_state != CAPTURE)
return TRUE;
- if ((dso_get_capturestate(devc, &capturestate, &trigger_offset)) != SR_OK)
+ if ((dso_get_capturestate(sdi, &capturestate, &trigger_offset)) != SR_OK)
return TRUE;
sr_dbg("Capturestate %d.", capturestate);
case CAPTURE_EMPTY:
if (++devc->capture_empty_count >= MAX_CAPTURE_EMPTY) {
devc->capture_empty_count = 0;
- if (dso_capture_start(devc) != SR_OK)
+ if (dso_capture_start(sdi) != SR_OK)
break;
- if (dso_enable_trigger(devc) != SR_OK)
+ if (dso_enable_trigger(sdi) != SR_OK)
break;
-// if (dso_force_trigger(devc) != SR_OK)
+// if (dso_force_trigger(sdi) != SR_OK)
// break;
sr_dbg("Successfully requested next chunk.");
}
}
static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
- void *cb_data)
+ void *cb_data)
{
const struct libusb_pollfd **lupfd;
struct dev_context *devc;
int i;
if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR;
+ return SR_ERR_DEV_CLOSED;
devc = sdi->priv;
devc->cb_data = cb_data;
return SR_ERR;
}
- if (dso_init(devc) != SR_OK)
+ if (dso_init(sdi) != SR_OK)
return SR_ERR;
- if (dso_capture_start(devc) != SR_OK)
+ if (dso_capture_start(sdi) != SR_OK)
return SR_ERR;
devc->dev_state = CAPTURE;
lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
for (i = 0; lupfd[i]; i++)
sr_source_add(lupfd[i]->fd, lupfd[i]->events, TICK,
- handle_event, (void *)sdi);
+ handle_event, (void *)sdi);
free(lupfd);
/* Send header packet to the session bus. */
projects / libsigrok.git / blobdiff