X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fapi.c;h=27957406386828511c03b02b4120be07382307e8;hb=bf622e6d00e7985e36a0ddb643e2bf05d66679a6;hp=cd33eb1a27311ab30b29a3c71529433eb99e7912;hpb=d4ccb6bd8fed2354eac92ea66ffdb274f0f78702;p=libsigrok.git

diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c
index cd33eb1a..27957406 100644
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -27,6 +27,11 @@ static struct sr_dev_driver *di = &yokogawa_dlm_driver_info;
 static char *MANUFACTURER_ID = "YOKOGAWA";
 static char *MANUFACTURER_NAME = "Yokogawa";
 
+static const uint32_t drvopts[] = {
+	SR_CONF_LOGIC_ANALYZER,
+	SR_CONF_OSCILLOSCOPE,
+};
+
 enum {
 	CG_INVALID = -1,
 	CG_NONE,
@@ -62,9 +67,13 @@ static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi)
 	if (dlm_model_get(hw_info->model, &model_name, &model_index) != SR_OK)
 		goto fail;
 
-	if (!(sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, MANUFACTURER_NAME,
-			model_name, NULL)))
-		goto fail;
+	sdi = g_malloc0(sizeof(struct sr_dev_inst));
+	sdi->status = SR_ST_ACTIVE;
+	sdi->vendor = g_strdup(MANUFACTURER_NAME);
+	sdi->model = g_strdup(model_name);
+	sdi->version = g_strdup(hw_info->firmware_version);
+
+	sdi->serial_num = g_strdup(hw_info->serial_number);
 
 	sr_scpi_hw_info_free(hw_info);
 	hw_info = NULL;
@@ -209,7 +218,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	state = devc->model_state;
 
 	switch (key) {
-	case SR_CONF_NUM_TIMEBASE:
+	case SR_CONF_NUM_HDIV:
 		*data = g_variant_new_int32(model->num_xdivs);
 		ret = SR_OK;
 		break;
@@ -464,26 +473,29 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
-	int cg_type;
-	struct dev_context *devc;
-	struct scope_config *model;
-
-	if (!sdi || !(devc = sdi->priv))
-		return SR_ERR_ARG;
+	int cg_type = CG_NONE;
+	struct dev_context *devc = NULL;
+	struct scope_config *model = NULL;
 
-	if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
-		return SR_ERR;
+	if (sdi && (devc = sdi->priv)) {
+		if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
+			return SR_ERR;
 
-	model = devc->model_config;
+		model = devc->model_config;
+	}
 
 	switch (key) {
 	case SR_CONF_DEVICE_OPTIONS:
 		if (cg_type == CG_NONE) {
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				model->devopts, model->num_devopts, sizeof(uint32_t));
+			if (model)
+				*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+					model->devopts, model->num_devopts, sizeof(uint32_t));
+			else
+				*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+					drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
 		} else if (cg_type == CG_ANALOG) {
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				model->analog_devopts, model->num_analog_devopts,	sizeof(uint32_t));
+				model->analog_devopts, model->num_analog_devopts, sizeof(uint32_t));
 		} else {
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
 				NULL, 0, sizeof(uint32_t));
@@ -496,14 +508,20 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 				g_strv_length((char **)*model->coupling_options));
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
+		if (!model)
+			return SR_ERR_ARG;
 		*data = g_variant_new_strv(*model->trigger_sources,
 				g_strv_length((char **)*model->trigger_sources));
 		break;
 	case SR_CONF_TRIGGER_SLOPE:
+		if (!model)
+			return SR_ERR_ARG;
 		*data = g_variant_new_strv(*model->trigger_slopes,
 				g_strv_length((char **)*model->trigger_slopes));
 		break;
 	case SR_CONF_TIMEBASE:
+		if (!model)
+			return SR_ERR_ARG;
 		*data = build_tuples(model->timebases, model->num_timebases);
 		break;
 	case SR_CONF_VDIV: