return SR_OK;
}
+/* Properly close and free all devices. */
+static void clear_instances(void)
+{
+ struct sr_dev_inst *sdi;
+ struct context *ctx;
+ GSList *l;
+
+ for (l = hdi->instances; l; l = l->next) {
+ if (!(sdi = l->data)) {
+ /* Log error, but continue cleaning up the rest. */
+ sr_err("hantek-dso: %s: sdi was NULL, continuing", __func__);
+ continue;
+ }
+ if (!(ctx = sdi->priv)) {
+ /* Log error, but continue cleaning up the rest. */
+ sr_err("hantek-dso: %s: sdi->priv was NULL, continuing", __func__);
+ continue;
+ }
+ dso_close(sdi);
+ sr_usb_dev_inst_free(ctx->usb);
+ g_free(ctx->triggersource);
+
+ sr_dev_inst_free(sdi);
+ }
+
+ g_slist_free(hdi->instances);
+ hdi->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 libusb_device_descriptor des;
const struct dso_profile *prof;
struct context *ctx;
+ GSList *devices;
+ struct libusb_device_descriptor des;
libusb_device **devlist;
int devcnt, ret, i, j;
- /* Find all Hantek DSO devices and upload firmware to all of them. */
+ (void)options;
devcnt = 0;
+ devices = 0;
+ hdi->instances = NULL;
+
+ clear_instances();
+
+ /* Find all Hantek DSO devices and upload firmware to all of them. */
libusb_get_device_list(usb_context, &devlist);
for (i = 0; devlist[i]; i++) {
if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
prof = &dev_profiles[j];
sr_dbg("hantek-dso: Found a %s %s.", prof->vendor, prof->model);
sdi = dso_dev_new(devcnt, prof);
+ devices = g_slist_append(devices, sdi);
ctx = sdi->priv;
if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
prof->firmware) == SR_OK)
sr_dbg("hantek-dso: Found a %s %s.", prof->vendor, prof->model);
sdi = dso_dev_new(devcnt, prof);
sdi->status = SR_ST_INACTIVE;
+ devices = g_slist_append(devices, sdi);
ctx = sdi->priv;
ctx->usb = sr_usb_dev_inst_new(
libusb_get_bus_number(devlist[i]),
}
libusb_free_device_list(devlist, 1);
- return devcnt;
+ return devices;
}
static int hw_dev_open(int dev_index)
static int hw_cleanup(void)
{
- GSList *l;
- struct sr_dev_inst *sdi;
- struct context *ctx;
- /* Properly close and free all devices. */
- for (l = hdi->instances; l; l = l->next) {
- if (!(sdi = l->data)) {
- /* Log error, but continue cleaning up the rest. */
- sr_err("hantek-dso: %s: sdi was NULL, continuing", __func__);
- continue;
- }
- if (!(ctx = sdi->priv)) {
- /* Log error, but continue cleaning up the rest. */
- sr_err("hantek-dso: %s: sdi->priv was NULL, continuing", __func__);
- continue;
- }
- dso_close(sdi);
- sr_usb_dev_inst_free(ctx->usb);
- g_free(ctx->triggersource);
-
- sr_dev_inst_free(sdi);
- }
-
- g_slist_free(hdi->instances);
- hdi->instances = NULL;
+ clear_instances();
if (usb_context)
libusb_exit(usb_context);
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;
- const void *info;
uint64_t tmp;
- if (!(sdi = sr_dev_inst_get(hdi->instances, dev_index)))
- return NULL;
-
- info = NULL;
- 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_BUFFERSIZES:
- info = buffersizes;
+ *data = buffersizes;
break;
case SR_DI_TIMEBASES:
- info = timebases;
+ *data = timebases;
break;
case SR_DI_TRIGGER_SOURCES:
- info = trigger_sources;
+ *data = trigger_sources;
break;
case SR_DI_FILTERS:
- info = filter_targets;
+ *data = filter_targets;
break;
case SR_DI_VDIVS:
- info = vdivs;
+ *data = vdivs;
break;
case SR_DI_COUPLING:
- info = coupling;
+ *data = coupling;
break;
/* TODO remove this */
case SR_DI_CUR_SAMPLERATE:
- info = &tmp;
+ *data = &tmp;
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,