"asix-sigma-phasor.fw", /* Frequency counter */
};
-static int hw_dev_acquisition_stop(int dev_index, void *cb_data);
+static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
+ void *cb_data);
static int sigma_read(void *buf, size_t size, struct context *ctx)
{
return SR_OK;
}
-static int hw_dev_open(int dev_index)
+static int hw_dev_open(struct sr_dev_inst *sdi)
{
- struct sr_dev_inst *sdi;
struct context *ctx;
int ret;
- if (!(sdi = sr_dev_inst_get(adi->instances, dev_index)))
- return SR_ERR;
-
ctx = sdi->priv;
/* Make sure it's an ASIX SIGMA. */
for (l = probes; l; l = l->next) {
probe = (struct sr_probe *)l->data;
- probebit = 1 << (probe->index - 1);
+ probebit = 1 << (probe->index);
if (!probe->enabled || !probe->trigger)
continue;
return SR_OK;
}
-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(adi->instances, dev_index))) {
- sr_err("sigma: %s: sdi was NULL", __func__);
- return SR_ERR_BUG;
- }
-
if (!(ctx = sdi->priv)) {
sr_err("sigma: %s: sdi->priv was NULL", __func__);
return SR_ERR_BUG;
return SR_OK;
}
-static int hw_dev_status_get(int dev_index)
-{
- struct sr_dev_inst *sdi;
-
- sdi = sr_dev_inst_get(adi->instances, dev_index);
- if (sdi)
- return sdi->status;
- else
- return SR_ST_NOT_FOUND;
-}
-
static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
const void *value)
{
if (running_msec < ctx->limit_msec && numchunks < 32767)
return TRUE; /* While capturing... */
else
- hw_dev_acquisition_stop(sdi->index, sdi);
+ hw_dev_acquisition_stop(sdi, sdi);
} else if (ctx->state.state == SIGMA_DOWNLOAD) {
if (ctx->state.chunks_downloaded >= numchunks) {
return SR_OK;
}
-static int hw_dev_acquisition_start(int dev_index, void *cb_data)
+static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
+ void *cb_data)
{
- struct sr_dev_inst *sdi;
struct context *ctx;
struct sr_datafeed_packet *packet;
struct sr_datafeed_header *header;
struct triggerinout triggerinout_conf;
struct triggerlut lut;
- if (!(sdi = sr_dev_inst_get(adi->instances, dev_index)))
- return SR_ERR;
-
ctx = sdi->priv;
/* If the samplerate has not been set, default to 200 kHz. */
sr_session_send(ctx->session_dev_id, packet);
/* Add capture source. */
- sr_source_add(0, G_IO_IN, 10, receive_data, sdi);
+ sr_source_add(0, G_IO_IN, 10, receive_data, (void *)sdi);
g_free(header);
g_free(packet);
return SR_OK;
}
-static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
+static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
+ void *cb_data)
{
- struct sr_dev_inst *sdi;
struct context *ctx;
uint8_t modestatus;
/* Avoid compiler warnings. */
(void)cb_data;
- if (!(sdi = sr_dev_inst_get(adi->instances, dev_index))) {
- sr_err("sigma: %s: sdi was NULL", __func__);
- return SR_ERR_BUG;
- }
-
if (!(ctx = sdi->priv)) {
sr_err("sigma: %s: sdi->priv was NULL", __func__);
return SR_ERR_BUG;
.dev_open = hw_dev_open,
.dev_close = hw_dev_close,
.info_get = hw_info_get,
- .dev_status_get = hw_dev_status_get,
.dev_config_set = hw_dev_config_set,
.dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop,