.freq_max = SR_GHZ(1.5),
.freq_min = SR_KHZ(5),
.power_max = 16,
- .power_min = -144
+ .power_min = -144,
},
{
.model_str = "SME03E",
.freq_max = SR_GHZ(2.2),
.freq_min = SR_KHZ(5),
.power_max = 16,
- .power_min = -144
+ .power_min = -144,
},
{
.model_str = "SME03A",
.freq_max = SR_GHZ(3),
.freq_min = SR_KHZ(5),
.power_max = 16,
- .power_min = -144
+ .power_min = -144,
},
{
.model_str = "SME03",
.freq_max = SR_GHZ(3),
.freq_min = SR_KHZ(5),
.power_max = 16,
- .power_min = -144
+ .power_min = -144,
},
{
.model_str = "SME06",
.freq_max = SR_GHZ(1.5),
.freq_min = SR_KHZ(5),
.power_max = 16,
- .power_min = -144
+ .power_min = -144,
}
};
SR_CONF_SERIALCOMM,
};
+static const uint32_t drvopts[] = {
+ SR_CONF_SIGNAL_GENERATOR,
+};
+
static const uint32_t devopts[] = {
SR_CONF_OUTPUT_FREQUENCY | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_AMPLITUDE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
}
if (!model_found) {
- sr_dbg("Device %s %s is not supported by this driver", manufacturer, sdi->model);
+ sr_dbg("Device %s %s is not supported by this driver.",
+ manufacturer, sdi->model);
return SR_ERR_NA;
}
rs_sme0x_mode_remote(scpi);
- if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
+ if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK)
goto fail;
- }
- if (strcmp(hw_info->manufacturer, manufacturer) != 0) {
+ if (strcmp(hw_info->manufacturer, manufacturer) != 0)
goto fail;
- }
sdi = g_malloc0(sizeof(struct sr_dev_inst));
sdi->vendor = g_strdup(hw_info->manufacturer);
devc = g_malloc0(sizeof(struct dev_context));
sdi->priv = devc;
- if (rs_init_device(sdi) != SR_OK) {
+ if (rs_init_device(sdi) != SR_OK)
goto fail;
- }
return sdi;
fail:
- if (hw_info) {
- sr_scpi_hw_info_free(hw_info);
- }
-
- if (sdi) {
- sr_dev_inst_free(sdi);
- }
-
+ sr_scpi_hw_info_free(hw_info);
+ sr_dev_inst_free(sdi);
g_free(devc);
return NULL;
}
static int dev_open(struct sr_dev_inst *sdi)
{
- if ((sdi->status != SR_ST_ACTIVE) && (sr_scpi_open(sdi->conn) != SR_OK)) {
+ if ((sdi->status != SR_ST_ACTIVE) && (sr_scpi_open(sdi->conn) != SR_OK))
return SR_ERR;
- }
sdi->status = SR_ST_ACTIVE;
static int dev_close(struct sr_dev_inst *sdi)
{
- if (sdi->status == SR_ST_INACTIVE) {
- return SR_OK;
- }
-
sr_scpi_close(sdi->conn);
sdi->status = SR_ST_INACTIVE;
(void)cg;
- if (!sdi) {
+ if (!sdi)
return SR_ERR_ARG;
- }
-
- if (sdi->status != SR_ST_ACTIVE) {
- return SR_ERR_DEV_CLOSED;
- }
switch (key) {
case SR_CONF_OUTPUT_FREQUENCY:
(void)sdi;
(void)cg;
+ /* Return drvopts without sdi (and devopts with sdi, see below). */
+ if (key == SR_CONF_DEVICE_OPTIONS && !sdi) {
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+ drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
+ return SR_OK;
+ }
+
switch (key) {
case SR_CONF_SCAN_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+ scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+ devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
break;
default:
return SR_ERR_NA;
static int dev_acquisition_start(const struct sr_dev_inst *sdi)
{
- if (sdi->status != SR_ST_ACTIVE) {
- return SR_ERR_DEV_CLOSED;
- }
+ (void)sdi;
return SR_OK;
}