return std_scan_complete(di, devices);
}
-static int dev_clear(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int dev_open(struct sr_dev_inst *sdi)
{
struct sr_dev_driver *di = sdi->driver;
if (devc->dig_samplerate == 0)
devc->dig_samplerate = samplerates[3];
- sdi->status = SR_ST_ACTIVE;
-
return SR_OK;
}
static int dev_close(struct sr_dev_inst *sdi)
{
- struct sr_usb_dev_inst *usb = sdi->conn;
-
- sr_usb_close(usb);
-
- sdi->status = SR_ST_INACTIVE;
+ sr_usb_close(sdi->conn);
return SR_OK;
}
{
struct sr_usb_dev_inst *usb;
struct dev_context *devc;
- int ret;
(void)cg;
- ret = SR_OK;
switch (key) {
case SR_CONF_CONN:
if (!sdi || !sdi->conn)
return SR_ERR_NA;
}
- return ret;
+ return SR_OK;
}
static int config_set(uint32_t key, GVariant *data,
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
struct dev_context *devc;
- int ret;
(void)cg;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
devc = sdi->priv;
- ret = SR_OK;
switch (key) {
case SR_CONF_SAMPLERATE:
devc->dig_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,
{
GVariant *gvar;
GVariantBuilder gvb;
- int ret;
(void)sdi;
(void)cg;
- ret = SR_OK;
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
return SR_ERR_NA;
}
- return ret;
+ return SR_OK;
}
static void dev_acquisition_abort(const struct sr_dev_inst *sdi)
uint8_t *buf;
unsigned int i, ret;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
ret = saleae_logic_pro_init(sdi);
if (ret != SR_OK)
return ret;
struct dev_context *devc = sdi->priv;
struct drv_context *drvc = sdi->driver->context;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
saleae_logic_pro_stop(sdi);
std_session_send_df_end(sdi);
.cleanup = std_cleanup,
.scan = scan,
.dev_list = std_dev_list,
- .dev_clear = dev_clear,
+ .dev_clear = std_dev_clear,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,