Various minor cosmetics and consistency fixes.

[libsigrok.git] / src / hardware / maynuo-m97 / api.c

diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c
index f1afdfe6cb886158bb92a8d0b7b58f52c0ff185f..494153fa3c6a1fbcc3d9cef2f9626742efade7ea 100644 (file)
--- a/src/hardware/maynuo-m97/api.c
+++ b/src/hardware/maynuo-m97/api.c
@@ -128,7 +128,7 @@ static struct sr_dev_inst *probe_device(struct sr_modbus_dev_inst *modbus)
        int ret = maynuo_m97_get_model_version(modbus, &id, &version);
        if (ret != SR_OK)
                return NULL;
-       for (i=0; i<ARRAY_SIZE(supported_models); i++)
+       for (i = 0; i < ARRAY_SIZE(supported_models); i++)
                if (id == supported_models[i].id) {
                        model = &supported_models[i];
                        break;
@@ -188,7 +188,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        if (!g_slist_find_custom(options, &default_modbusaddr, config_compare))
                opts = g_slist_prepend(opts, &default_modbusaddr);
 
-       devices = sr_modbus_scan(di->priv, opts, probe_device);
+       devices = sr_modbus_scan(di->context, opts, probe_device);
 
        while (opts != options)
                opts = g_slist_delete_link(opts, opts);
@@ -200,7 +200,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-       return ((struct drv_context *)(di->priv))->instances;
+       return ((struct drv_context *)(di->context))->instances;
 }
 
 static int dev_clear(const struct sr_dev_driver *di)
@@ -516,5 +516,5 @@ SR_PRIV struct sr_dev_driver maynuo_m97_driver_info = {
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };