X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fagilent-dmm%2Fapi.c;h=0c743b329ef8d58eea5af0d4a738b8e90acb52df;hb=bbabdaf1e2802aeef7d48fab4b0dc3507a69ffe9;hp=a58e57c32e2a983d30653ae1761975c5d51b4bf1;hpb=d43b090816f61e77d8054084e85202de1a1ebeb7;p=libsigrok.git

diff --git a/hardware/agilent-dmm/api.c b/hardware/agilent-dmm/api.c
index a58e57c3..0c743b32 100644
--- a/hardware/agilent-dmm/api.c
+++ b/hardware/agilent-dmm/api.c
@@ -61,11 +61,6 @@ static const struct agdmm_profile supported_agdmm[] = {
 SR_PRIV struct sr_dev_driver agdmm_driver_info;
 static struct sr_dev_driver *di = &agdmm_driver_info;
 
-static int dev_clear(void)
-{
-	return std_dev_clear(di, NULL);
-}
-
 static int init(struct sr_context *sr_ctx)
 {
 	return std_init(sr_ctx, di, LOG_PREFIX);
@@ -133,7 +128,7 @@ static GSList *scan(GSList *options)
 		for (i = 0; supported_agdmm[i].model; i++) {
 			if (strcmp(supported_agdmm[i].modelname, tokens[1]))
 				continue;
-			if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, tokens[0],
+			if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Agilent",
 					tokens[1], tokens[3])))
 				return NULL;
 			if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
@@ -169,22 +164,9 @@ static GSList *dev_list(void)
 	return ((struct drv_context *)(di->priv))->instances;
 }
 
-static int dev_open(struct sr_dev_inst *sdi)
-{
-	struct sr_serial_dev_inst *serial;
-
-	serial = sdi->conn;
-	if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
-		return SR_ERR;
-
-	sdi->status = SR_ST_ACTIVE;
-
-	return SR_OK;
-}
-
 static int cleanup(void)
 {
-	return dev_clear();
+	return std_dev_clear(di, NULL);
 }
 
 static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
@@ -286,11 +268,11 @@ SR_PRIV struct sr_dev_driver agdmm_driver_info = {
 	.cleanup = cleanup,
 	.scan = scan,
 	.dev_list = dev_list,
-	.dev_clear = dev_clear,
+	.dev_clear = NULL,
 	.config_get = NULL,
 	.config_set = config_set,
 	.config_list = config_list,
-	.dev_open = dev_open,
+	.dev_open = std_serial_dev_open,
 	.dev_close = std_serial_dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,