return SR_OK;
}
+static void clear_instances(void)
+{
+ GSList *l;
+ struct sr_dev_inst *sdi;
+ struct context *ctx;
+
+ /* Properly close all devices. */
+ for (l = adi->instances; l; l = l->next) {
+ if (!(sdi = l->data)) {
+ /* Log error, but continue cleaning up the rest. */
+ sr_err("sigma: %s: sdi was NULL, continuing", __func__);
+ continue;
+ }
+ if (sdi->priv) {
+ ctx = sdi->priv;
+ ftdi_free(&ctx->ftdic);
+ g_free(ctx);
+ }
+ sr_dev_inst_free(sdi);
+ }
+ g_slist_free(adi->instances);
+ adi->instances = NULL;
+
+}
+
static int hw_init(void)
{
return SR_OK;
}
-static int hw_scan(void)
+static GSList *hw_scan(GSList *options)
{
struct sr_dev_inst *sdi;
struct context *ctx;
+ GSList *devices;
struct ftdi_device_list *devlist;
char serial_txt[10];
uint32_t serial;
+ int ret;
+
+ (void)options;
+ devices = NULL;
+ clear_instances();
if (!(ctx = g_try_malloc(sizeof(struct context)))) {
sr_err("sigma: %s: ctx malloc failed", __func__);
- return SR_ERR_MALLOC;
+ return NULL;
}
ftdi_init(&ctx->ftdic);
/* Look for SIGMAs. */
- if (ftdi_usb_find_all(&ctx->ftdic, &devlist,
- USB_VENDOR, USB_PRODUCT) <= 0)
+ if ((ret = ftdi_usb_find_all(&ctx->ftdic, &devlist,
+ USB_VENDOR, USB_PRODUCT)) <= 0) {
+ if (ret < 0)
+ sr_err("ftdi_usb_find_all(): %d", ret);
goto free;
+ }
/* Make sure it's a version 1 or 2 SIGMA. */
ftdi_usb_get_strings(&ctx->ftdic, devlist->dev, NULL, 0, NULL, 0,
sr_err("sigma: %s: sdi was NULL", __func__);
goto free;
}
-
- sdi->priv = ctx;
-
+ devices = g_slist_append(devices, sdi);
adi->instances = g_slist_append(adi->instances, sdi);
+ sdi->priv = ctx;
/* We will open the device again when we need it. */
ftdi_list_free(&devlist);
- return 1;
+ return devices;
free:
+ ftdi_deinit(&ctx->ftdic);
g_free(ctx);
- return 0;
+ return NULL;
}
static int upload_firmware(int firmware_idx, struct context *ctx)
static int hw_cleanup(void)
{
- GSList *l;
- struct sr_dev_inst *sdi;
- int ret = SR_OK;
- /* Properly close all devices. */
- for (l = adi->instances; l; l = l->next) {
- if (!(sdi = l->data)) {
- /* Log error, but continue cleaning up the rest. */
- sr_err("sigma: %s: sdi was NULL, continuing", __func__);
- ret = SR_ERR_BUG;
- continue;
- }
- sr_dev_inst_free(sdi);
- }
- g_slist_free(adi->instances);
- adi->instances = NULL;
+ clear_instances();
- return ret;
+ return SR_OK;
}
-static const void *hw_dev_info_get(int dev_index, int dev_info_id)
+static int hw_info_get(int info_id, const void **data,
+ const struct sr_dev_inst *sdi)
{
- struct sr_dev_inst *sdi;
struct context *ctx;
- const void *info = NULL;
- if (!(sdi = sr_dev_inst_get(adi->instances, dev_index))) {
- sr_err("sigma: %s: sdi was NULL", __func__);
- return NULL;
- }
-
- ctx = sdi->priv;
-
- switch (dev_info_id) {
+ switch (info_id) {
case SR_DI_INST:
- info = sdi;
+ *data = sdi;
break;
case SR_DI_NUM_PROBES:
- info = GINT_TO_POINTER(NUM_PROBES);
+ *data = GINT_TO_POINTER(NUM_PROBES);
break;
case SR_DI_PROBE_NAMES:
- info = probe_names;
+ *data = probe_names;
break;
case SR_DI_SAMPLERATES:
- info = &samplerates;
+ *data = &samplerates;
break;
case SR_DI_TRIGGER_TYPES:
- info = (char *)TRIGGER_TYPES;
+ *data = (char *)TRIGGER_TYPES;
break;
case SR_DI_CUR_SAMPLERATE:
- info = &ctx->cur_samplerate;
+ if (sdi) {
+ ctx = sdi->priv;
+ *data = &ctx->cur_samplerate;
+ } else
+ return SR_ERR;
break;
}
- return info;
+ return SR_OK;
}
static int hw_dev_status_get(int dev_index)
.scan = hw_scan,
.dev_open = hw_dev_open,
.dev_close = hw_dev_close,
- .dev_info_get = hw_dev_info_get,
+ .info_get = hw_info_get,
.dev_status_get = hw_dev_status_get,
- .hwcap_get_all = hw_hwcap_get_all,
+// .hwcap_get_all = hw_hwcap_get_all,
.dev_config_set = hw_dev_config_set,
.dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop,