X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffluke-dmm%2Fapi.c;h=4dd49c19c1525466c111f96a4e75f6e92cdf1e90;hb=fdf4a1f5a0a04046ec014786b4a8fce125e1163c;hp=c64aa5ca4451c668a41d70d0ba485500416095d9;hpb=771bd216fad9ad09666b4a41712e7fcb33ed6d9e;p=libsigrok.git

diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c
index c64aa5ca..4dd49c19 100644
--- a/hardware/fluke-dmm/api.c
+++ b/hardware/fluke-dmm/api.c
@@ -58,14 +58,14 @@ static const struct flukedmm_profile supported_flukedmm[] = {
 	{ FLUKE_190, "199B", 1000, 3500 },
 };
 
-static int clear_instances(void)
+static int dev_clear(void)
 {
 	return std_dev_clear(di, NULL);
 }
 
 static int init(struct sr_context *sr_ctx)
 {
-	return std_hw_init(sr_ctx, di, LOG_PREFIX);
+	return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *fluke_scan(const char *conn, const char *serialcomm)
@@ -230,7 +230,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 static int cleanup(void)
 {
-	return clear_instances();
+	return dev_clear();
 }
 
 static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
@@ -323,8 +323,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-	return std_hw_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
-	       sdi->conn, LOG_PREFIX);
+	return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
+			sdi->conn, LOG_PREFIX);
 }
 
 SR_PRIV struct sr_dev_driver flukedmm_driver_info = {
@@ -335,7 +335,7 @@ SR_PRIV struct sr_dev_driver flukedmm_driver_info = {
 	.cleanup = cleanup,
 	.scan = scan,
 	.dev_list = dev_list,
-	.dev_clear = clear_instances,
+	.dev_clear = dev_clear,
 	.config_get = NULL,
 	.config_set = config_set,
 	.config_list = config_list,