X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fapi.c;h=77feac8637d54c00d039fd761cf5a39794bba0d3;hb=bf622e6d00e7985e36a0ddb643e2bf05d66679a6;hp=4950d89fb3a13cb99704df3bb361dfd9e94cc09f;hpb=584560f142e1b17b9f4ef9069bd3724f2f77e750;p=libsigrok.git

diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c
index 4950d89f..77feac86 100644
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -29,6 +29,10 @@ static const char *manufacturers[] = {
 	"HAMEG",
 };
 
+static const uint32_t drvopts[] = {
+	SR_CONF_OSCILLOSCOPE,
+};
+
 static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
 	SR_CONF_SERIALCOMM,
@@ -75,21 +79,22 @@ static struct sr_dev_inst *hmo_probe_serial_device(struct sr_scpi_dev_inst *scpi
 	if (check_manufacturer(hw_info->manufacturer) != SR_OK)
 		goto fail;
 
-	if (!(sdi = sr_dev_inst_new(0, SR_ST_ACTIVE,
-				    hw_info->manufacturer, hw_info->model,
-				    hw_info->firmware_version))) {
-		goto fail;
-	}
+	sdi = g_malloc0(sizeof(struct sr_dev_inst));
+	sdi->status = SR_ST_ACTIVE;
+	sdi->vendor = g_strdup(hw_info->manufacturer);
+	sdi->model = g_strdup(hw_info->model);
+	sdi->version = g_strdup(hw_info->firmware_version);
+	sdi->serial_num = g_strdup(hw_info->serial_number);
+	sdi->driver = di;
+	sdi->inst_type = SR_INST_SCPI;
+	sdi->conn = scpi;
+
 	sr_scpi_hw_info_free(hw_info);
 	hw_info = NULL;
 
-	if (!(devc = g_try_malloc0(sizeof(struct dev_context))))
-		goto fail;
+	devc = g_malloc0(sizeof(struct dev_context));
 
-	sdi->driver = di;
 	sdi->priv = devc;
-	sdi->inst_type = SR_INST_SCPI;
-	sdi->conn = scpi;
 
 	if (hmo_init_device(sdi) != SR_OK)
 		goto fail;
@@ -216,7 +221,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;
@@ -495,17 +500,16 @@ 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;
+	int cg_type = CG_NONE;
+	struct dev_context *devc = NULL;
+	struct scope_config *model = NULL;
 
-	if (!sdi || !(devc = sdi->priv))
-		return SR_ERR_ARG;
-
-	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_SCAN_OPTIONS:
@@ -514,12 +518,15 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 		break;
 	case SR_CONF_DEVICE_OPTIONS:
 		if (cg_type == CG_NONE) {
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				model->hw_caps, model->num_hwcaps,
-				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_hwcaps, model->num_analog_hwcaps,
+				model->analog_devopts, model->num_analog_devopts,
 				sizeof(uint32_t));
 		} else {
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
@@ -533,14 +540,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: