X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fbrymen-dmm%2Fapi.c;h=7302243e6a2136f6fd3bbafe3a35ba31a7e5acf7;hb=8e2da1a650dade6529668d4b22e906ccec172b17;hp=ac0ad86b9bf7a641455ca26beb1305ebe2537b96;hpb=40bbc64293f7a93cc25e594801315c6990b3bb03;p=libsigrok.git

diff --git a/hardware/brymen-dmm/api.c b/hardware/brymen-dmm/api.c
index ac0ad86b..7302243e 100644
--- a/hardware/brymen-dmm/api.c
+++ b/hardware/brymen-dmm/api.c
@@ -36,10 +36,10 @@ static struct sr_dev_driver *di = &brymen_bm857_driver_info;
 
 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 int clear_instances(void)
+static int dev_clear(void)
 {
 	return std_dev_clear(di, NULL);
 }
@@ -177,7 +177,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)
@@ -264,8 +264,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 brymen_bm857_driver_info = {
@@ -276,7 +276,7 @@ SR_PRIV struct sr_dev_driver brymen_bm857_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,