return std_scan_complete(di, g_slist_append(NULL, sdi));
}
-static int dev_open(struct sr_dev_inst *sdi)
+static void clear_helper(struct dev_context *devc)
{
- (void)sdi;
-
- return SR_OK;
-}
-
-static int dev_close(struct sr_dev_inst *sdi)
-{
- sdi->status = SR_ST_INACTIVE;
-
- return SR_OK;
-}
-
-static void clear_helper(void *priv)
-{
- struct dev_context *devc;
GHashTableIter iter;
void *value;
- devc = priv;
-
/* Analog generators. */
g_hash_table_iter_init(&iter, devc->ch_ag);
while (g_hash_table_iter_next(&iter, NULL, &value))
g_free(value);
g_hash_table_unref(devc->ch_ag);
- g_free(devc);
}
static int dev_clear(const struct sr_dev_driver *di)
{
- return std_dev_clear(di, clear_helper);
+ return std_dev_clear_with_callback(di, (std_dev_clear_callback)clear_helper);
}
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
struct analog_gen *ag;
struct sr_channel *ch;
GSList *l;
- int logic_pattern, analog_pattern, ret;
+ int logic_pattern, analog_pattern;
unsigned int i;
const char *stropt;
devc = sdi->priv;
- ret = SR_OK;
switch (key) {
case SR_CONF_SAMPLERATE:
devc->cur_samplerate = g_variant_get_uint64(data);
}
break;
default:
- ret = SR_ERR_NA;
+ return SR_ERR_NA;
}
- return ret;
+ return SR_OK;
}
static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
bitpos = devc->enabled_logic_channels % 8;
mask = (1 << bitpos) - 1;
devc->first_partial_logic_mask = mask;
- sr_dbg("DBG: %s(), num logic %zu, partial off %zu, mask 0x%02x",
- __func__, devc->enabled_logic_channels,
+ sr_dbg("num logic %zu, partial off %zu, mask 0x%02x.",
+ devc->enabled_logic_channels,
devc->first_partial_logic_index,
devc->first_partial_logic_mask);
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,
- .dev_open = dev_open,
- .dev_close = dev_close,
+ .dev_open = std_dummy_dev_open,
+ .dev_close = std_dummy_dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
.context = NULL,