/* Function prototypes. */
static int hw_dev_acquisition_stop(int dev_index, void *cb_data);
+static void clear_instances(void)
+{
+ GSList *l;
+ struct sr_dev_inst *sdi;
+ struct context *ctx;
+
+ /* Properly close all devices. */
+ for (l = cdi->instances; l; l = l->next) {
+ if (!(sdi = l->data)) {
+ /* Log error, but continue cleaning up the rest. */
+ sr_err("la8: %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(cdi->instances);
+ cdi->instances = NULL;
+
+}
+
static int hw_init(void)
{
return SR_OK;
}
-static int hw_scan(void)
+static GSList *hw_scan(GSList *options)
{
- int ret;
struct sr_dev_inst *sdi;
struct context *ctx;
+ GSList *devices;
unsigned int i;
+ int ret;
+
+ (void)options;
+ devices = NULL;
/* Allocate memory for our private driver context. */
if (!(ctx = g_try_malloc(sizeof(struct context)))) {
sr_err("la8: %s: sr_dev_inst_new failed", __func__);
goto err_close_ftdic;
}
-
+ sdi->driver = cdi;
sdi->priv = ctx;
+ devices = g_slist_append(devices, sdi);
cdi->instances = g_slist_append(cdi->instances, sdi);
sr_spew("la8: Device init successful.");
/* Close device. We'll reopen it again when we need it. */
(void) la8_close(ctx); /* Log, but ignore errors. */
- return 1;
+ return devices;
err_close_ftdic:
(void) la8_close(ctx); /* Log, but ignore errors. */
g_free(ctx);
err_free_nothing:
- return 0;
+ return NULL;
}
-static int hw_dev_open(int dev_index)
+static int hw_dev_open(struct sr_dev_inst *sdi)
{
- int ret;
- struct sr_dev_inst *sdi;
struct context *ctx;
-
- if (!(sdi = sr_dev_inst_get(cdi->instances, dev_index))) {
- sr_err("la8: %s: sdi was NULL", __func__);
- return SR_ERR_BUG;
- }
+ int ret;
if (!(ctx = sdi->priv)) {
sr_err("la8: %s: sdi->priv was NULL", __func__);
return SR_ERR;
}
-static int hw_dev_close(int dev_index)
+static int hw_dev_close(struct sr_dev_inst *sdi)
{
- struct sr_dev_inst *sdi;
struct context *ctx;
- if (!(sdi = sr_dev_inst_get(cdi->instances, dev_index))) {
- sr_err("la8: %s: sdi was NULL", __func__);
- return SR_ERR_BUG;
- }
-
if (!(ctx = sdi->priv)) {
sr_err("la8: %s: sdi->priv was NULL", __func__);
return SR_ERR_BUG;
static int hw_cleanup(void)
{
- GSList *l;
- struct sr_dev_inst *sdi;
- int ret = SR_OK;
- /* Properly close all devices. */
- for (l = cdi->instances; l; l = l->next) {
- if (!(sdi = l->data)) {
- /* Log error, but continue cleaning up the rest. */
- sr_err("la8: %s: sdi was NULL, continuing", __func__);
- ret = SR_ERR_BUG;
- continue;
- }
- sr_dev_inst_free(sdi); /* Returns void. */
- }
- g_slist_free(cdi->instances); /* Returns void. */
- cdi->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;
-
- if (!(sdi = sr_dev_inst_get(cdi->instances, dev_index))) {
- sr_err("la8: %s: sdi was NULL", __func__);
- return NULL;
- }
-
- if (!(ctx = sdi->priv)) {
- sr_err("la8: %s: sdi->priv was NULL", __func__);
- return NULL;
- }
-
- sr_spew("la8: %s: dev_index %d, dev_info_id %d.", __func__,
- dev_index, dev_info_id);
- switch (dev_info_id) {
+ switch (info_id) {
case SR_DI_INST:
- info = sdi;
+ *data = sdi;
sr_spew("la8: %s: Returning sdi.", __func__);
break;
+ case SR_DI_HWCAPS:
+ *data = hwcaps;
+ break;
case SR_DI_NUM_PROBES:
- info = GINT_TO_POINTER(NUM_PROBES);
+ *data = GINT_TO_POINTER(NUM_PROBES);
sr_spew("la8: %s: Returning number of probes: %d.", __func__,
NUM_PROBES);
break;
case SR_DI_PROBE_NAMES:
- info = probe_names;
+ *data = probe_names;
sr_spew("la8: %s: Returning probenames.", __func__);
break;
case SR_DI_SAMPLERATES:
fill_supported_samplerates_if_needed();
- info = &samplerates;
+ *data = &samplerates;
sr_spew("la8: %s: Returning samplerates.", __func__);
break;
case SR_DI_TRIGGER_TYPES:
- info = TRIGGER_TYPES;
+ *data = (char *)TRIGGER_TYPES;
sr_spew("la8: %s: Returning trigger types: %s.", __func__,
TRIGGER_TYPES);
break;
case SR_DI_CUR_SAMPLERATE:
- info = &ctx->cur_samplerate;
- sr_spew("la8: %s: Returning samplerate: %" PRIu64 "Hz.",
- __func__, ctx->cur_samplerate);
+ if (sdi) {
+ ctx = sdi->priv;
+ *data = &ctx->cur_samplerate;
+ sr_spew("la8: %s: Returning samplerate: %" PRIu64 "Hz.",
+ __func__, ctx->cur_samplerate);
+ } else
+ return SR_ERR;
break;
default:
- /* Unknown device info ID, return NULL. */
- sr_err("la8: %s: Unknown device info ID", __func__);
- info = NULL;
- break;
+ return SR_ERR_ARG;
}
- return info;
+ return SR_OK;
}
static int hw_dev_status_get(int dev_index)
return sdi->status;
}
-static const int *hw_hwcap_get_all(void)
-{
- sr_spew("la8: Returning list of device capabilities.");
-
- 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;
- if (!(sdi = sr_dev_inst_get(cdi->instances, dev_index))) {
- sr_err("la8: %s: sdi was NULL", __func__);
- return SR_ERR_BUG;
- }
-
if (!(ctx = sdi->priv)) {
sr_err("la8: %s: sdi->priv was NULL", __func__);
return SR_ERR_BUG;
}
- sr_spew("la8: %s: dev_index %d, hwcap %d", __func__, dev_index, hwcap);
-
switch (hwcap) {
case SR_HWCAP_SAMPLERATE:
if (set_samplerate(sdi, *(const uint64_t *)value) == SR_ERR) {
.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,
projects / libsigrok.git / blobdiff