};
SR_PRIV libusb_context *usb_context = NULL;
-SR_PRIV GSList *dev_insts = NULL;
+SR_PRIV struct sr_dev_driver hantek_dso_driver_info;
+static struct sr_dev_driver *hdi = &hantek_dso_driver_info;
static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof)
{
ctx->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE);
ctx->triggerposition = DEFAULT_HORIZ_TRIGGERPOS;
sdi->priv = ctx;
- dev_insts = g_slist_append(dev_insts, sdi);
+ hdi->instances = g_slist_append(hdi->instances, sdi);
return sdi;
}
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)
int64_t timediff_us, timediff_ms;
int err;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ if (!(sdi = sr_dev_inst_get(hdi->instances, dev_index)))
return SR_ERR_ARG;
ctx = sdi->priv;
{
struct sr_dev_inst *sdi;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ if (!(sdi = sr_dev_inst_get(hdi->instances, dev_index)))
return SR_ERR_ARG;
dso_close(sdi);
static int hw_cleanup(void)
{
- GSList *l;
- struct sr_dev_inst *sdi;
- struct context *ctx;
-
- /* Properly close and free all devices. */
- for (l = dev_insts; 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(dev_insts);
- dev_insts = NULL;
+ clear_instances();
if (usb_context)
libusb_exit(usb_context);
const void *info;
uint64_t tmp;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ if (!(sdi = sr_dev_inst_get(hdi->instances, dev_index)))
return NULL;
info = NULL;
{
struct sr_dev_inst *sdi;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ if (!(sdi = sr_dev_inst_get(hdi->instances, dev_index)))
return SR_ST_NOT_FOUND;
return sdi->status;
int ret, i;
char **targets;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ if (!(sdi = sr_dev_inst_get(hdi->instances, dev_index)))
return SR_ERR;
if (sdi->status != SR_ST_ACTIVE)
struct context *ctx;
int i;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ if (!(sdi = sr_dev_inst_get(hdi->instances, dev_index)))
return SR_ERR;
if (sdi->status != SR_ST_ACTIVE)
struct sr_dev_inst *sdi;
struct context *ctx;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ if (!(sdi = sr_dev_inst_get(hdi->instances, dev_index)))
return SR_ERR;
if (sdi->status != SR_ST_ACTIVE)
.dev_config_set = hw_dev_config_set,
.dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop,
+ .instances = NULL,
};