supported_samplerates,
};
-static GSList *dev_insts = NULL;
static libusb_context *usb_context = NULL;
-static int hw_dev_config_set(int dev_index, int hwcap, const void *value);
+SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
+static struct sr_dev_driver *fdi = &fx2lafw_driver_info;
+static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
+ const void *value);
static int hw_dev_acquisition_stop(int dev_index, void *cb_data);
/**
int ret, skip, i;
uint8_t revid;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ if (!(sdi = sr_dev_inst_get(fdi->instances, dev_index)))
return SR_ERR;
ctx = sdi->priv;
return ctx;
}
+static int clear_instances(void)
+{
+ GSList *l;
+ struct sr_dev_inst *sdi;
+ struct context *ctx;
+ int ret;
+
+ ret = SR_OK;
+ for (l = fdi->instances; l; l = l->next) {
+ if (!(sdi = l->data)) {
+ /* Log error, but continue cleaning up the rest. */
+ sr_err("fx2lafw: %s: sdi was NULL, continuing.",
+ __func__);
+ ret = SR_ERR_BUG;
+ continue;
+ }
+ if (!(ctx = sdi->priv)) {
+ /* Log error, but continue cleaning up the rest. */
+ sr_err("fx2lafw: %s: sdi->priv was NULL, continuing",
+ __func__);
+ ret = SR_ERR_BUG;
+ continue;
+ }
+ close_dev(sdi);
+ sdi = l->data;
+ sr_dev_inst_free(sdi);
+ }
+
+ g_slist_free(fdi->instances);
+ fdi->instances = NULL;
+
+ return ret;
+}
+
+
/*
* API callbacks
*/
/* Avoid compiler warnings. */
(void)options;
+ /* This scan always invalidates any previous scans. */
+ clear_instances();
+
/* Find all fx2lafw compatible devices and upload firmware to them. */
devices = NULL;
libusb_get_device_list(usb_context, &devlist);
if (!prof)
continue;
+ devcnt = g_slist_length(fdi->instances);
sdi = sr_dev_inst_new(devcnt, SR_ST_INITIALIZING,
prof->vendor, prof->model, prof->model_version);
if (!sdi)
return 0;
+ sdi->driver = fdi;
/* Fill in probelist according to this device's profile. */
num_logic_probes = prof->dev_caps & DEV_CAPS_16BIT ? 16 : 8;
- for (j = 0; i < num_logic_probes; j++) {
+ for (j = 0; j < num_logic_probes; j++) {
if (!(probe = sr_probe_new(j, SR_PROBE_LOGIC, TRUE,
probe_names[j])))
return 0;
ctx = fx2lafw_dev_new();
ctx->profile = prof;
sdi->priv = ctx;
- dev_insts = g_slist_append(dev_insts, sdi);
+ fdi->instances = g_slist_append(fdi->instances, sdi);
+ devices = g_slist_append(devices, sdi);
if (check_conf_profile(devlist[i])) {
/* Already has the firmware, so fix the new address. */
int ret;
int64_t timediff_us, timediff_ms;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ if (!(sdi = sr_dev_inst_get(fdi->instances, dev_index)))
return SR_ERR;
ctx = sdi->priv;
if (ctx->cur_samplerate == 0) {
/* Samplerate hasn't been set; default to the slowest one. */
- if (hw_dev_config_set(dev_index, SR_HWCAP_SAMPLERATE,
+ if (hw_dev_config_set(sdi, SR_HWCAP_SAMPLERATE,
&supported_samplerates[0]) == SR_ERR)
return SR_ERR;
}
{
struct sr_dev_inst *sdi;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+ if (!(sdi = sr_dev_inst_get(fdi->instances, dev_index))) {
sr_err("fx2lafw: %s: sdi was NULL.", __func__);
return SR_ERR_BUG;
}
static int hw_cleanup(void)
{
- GSList *l;
- struct sr_dev_inst *sdi;
- struct context *ctx;
- int ret = SR_OK;
-
- for (l = dev_insts; l; l = l->next) {
- if (!(sdi = l->data)) {
- /* Log error, but continue cleaning up the rest. */
- sr_err("fx2lafw: %s: sdi was NULL, continuing.",
- __func__);
- ret = SR_ERR_BUG;
- continue;
- }
- if (!(ctx = sdi->priv)) {
- /* Log error, but continue cleaning up the rest. */
- sr_err("fx2lafw: %s: sdi->priv was NULL, continuing",
- __func__);
- ret = SR_ERR_BUG;
- continue;
- }
- close_dev(sdi);
- sdi = l->data;
- sr_dev_inst_free(sdi);
- }
+ int ret;
- g_slist_free(dev_insts);
- dev_insts = NULL;
+ ret = clear_instances();
if (usb_context)
libusb_exit(usb_context);
return ret;
}
-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;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
- return NULL;
- ctx = sdi->priv;
-
- switch (dev_info_id) {
+ switch (info_id) {
case SR_DI_INST:
- return sdi;
+ *data = sdi;
+ break;
+ case SR_DI_HWCAPS:
+ *data = hwcaps;
+ break;
case SR_DI_NUM_PROBES:
- return GINT_TO_POINTER(
- (ctx->profile->dev_caps & DEV_CAPS_16BIT) ?
- 16 : 8);
+ if (sdi) {
+ ctx = sdi->priv;
+ *data = GINT_TO_POINTER(
+ (ctx->profile->dev_caps & DEV_CAPS_16BIT) ?
+ 16 : 8);
+ } else
+ return SR_ERR;
+ break;
case SR_DI_PROBE_NAMES:
- return probe_names;
+ *data = probe_names;
+ break;
case SR_DI_SAMPLERATES:
- return &samplerates;
+ *data = &samplerates;
+ break;
case SR_DI_TRIGGER_TYPES:
- return TRIGGER_TYPES;
+ *data = TRIGGER_TYPES;
+ break;
case SR_DI_CUR_SAMPLERATE:
- return &ctx->cur_samplerate;
+ if (sdi) {
+ ctx = sdi->priv;
+ *data = &ctx->cur_samplerate;
+ } else
+ return SR_ERR;
+ break;
+ default:
+ return SR_ERR_ARG;
}
- return NULL;
+ return SR_OK;
}
static int hw_dev_status_get(int dev_index)
{
const struct sr_dev_inst *const sdi =
- sr_dev_inst_get(dev_insts, dev_index);
+ sr_dev_inst_get(fdi->instances, dev_index);
if (!sdi)
return SR_ST_NOT_FOUND;
return sdi->status;
}
-static const int *hw_hwcap_get_all(void)
-{
- return hwcaps;
-}
-
-static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
+static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
+ const void *value)
{
- struct sr_dev_inst *sdi;
struct context *ctx;
int ret;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
- return SR_ERR;
ctx = sdi->priv;
if (hwcap == SR_HWCAP_SAMPLERATE) {
int ret;
unsigned char *buf;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ if (!(sdi = sr_dev_inst_get(fdi->instances, dev_index)))
return SR_ERR;
ctx = sdi->priv;
/* Avoid compiler warnings. */
(void)cb_data;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ if (!(sdi = sr_dev_inst_get(fdi->instances, dev_index)))
return SR_ERR;
abort_acquisition(sdi->priv);
.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,
.dev_config_set = hw_dev_config_set,
.dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop,
+ .instances = NULL,
};
projects / libsigrok.git / blobdiff