serial.c: Drop unneeded <glob.h>.

[libsigrok.git] / hardware / brymen-dmm / api.c

diff --git a/hardware/brymen-dmm/api.c b/hardware/brymen-dmm/api.c
index 3db7d337f9d70089b6dbeba304264157c551f5f7..7302243e6a2136f6fd3bbafe3a35ba31a7e5acf7 100644 (file)
--- a/hardware/brymen-dmm/api.c
+++ b/hardware/brymen-dmm/api.c
@@ -36,34 +36,12 @@ 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 void free_instance(void *inst)
+static int dev_clear(void)
 {
-       struct sr_dev_inst *sdi;
-       struct sr_serial_dev_inst *serial;
-
-       if (!(sdi = inst))
-               return;
-
-       serial = sdi->conn;
-       sr_serial_dev_inst_free(serial);
-       sr_dev_inst_free(sdi);
-}
-
-/* Properly close and free all devices. */
-static int clear_instances(void)
-{
-       struct drv_context *drvc;
-
-       if (!(drvc = di->priv))
-               return SR_OK;
-
-       g_slist_free_full(drvc->instances, free_instance);
-       drvc->instances = NULL;
-
-       return SR_OK;
+       return std_dev_clear(di, NULL);
 }
 
 static GSList *brymen_scan(const char *conn, const char *serialcomm)
@@ -199,9 +177,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 static int cleanup(void)
 {
-       clear_instances();
-
-       return SR_OK;
+       return dev_clear();
 }
 
 static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
@@ -288,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 = {
@@ -300,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,