Fix #442 by renaming sr_dev_driver.priv to .context

[libsigrok.git] / src / hardware / norma-dmm / api.c

diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c
index 174425b709e4087d9e2aaf9352d21c69f2cd1144..c86f9c7d40a48ec4259a8a45bef17585615e3f8a 100644 (file)
--- a/src/hardware/norma-dmm/api.c
+++ b/src/hardware/norma-dmm/api.c
@@ -66,17 +66,12 @@ static const char* get_typestr(int type, struct sr_dev_driver* drv)
        return nameref[type-1][(drv == &siemens_b102x_driver_info)];
 }
 
-static int init_norma_dmm(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, &norma_dmm_driver_info, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
-static int init_siemens_b102x(struct sr_context *sr_ctx)
-{
-       return std_init(sr_ctx, &siemens_b102x_driver_info, LOG_PREFIX);
-}
-
-static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
+static GSList *scan(struct sr_dev_driver* drv, GSList *options)
 {
        struct sr_dev_inst *sdi;
        struct drv_context *drvc;
@@ -118,10 +113,7 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
 
        serial_flush(serial);
 
-       if (!(buf = g_try_malloc(BUF_MAX))) {
-               sr_err("Serial buffer malloc failed.");
-               return NULL;
-       }
+       buf = g_malloc(BUF_MAX);
 
        snprintf(req, sizeof(req), "%s\r\n",
                 nmadmm_requests[NMADMM_REQ_IDN].req_str);
@@ -181,24 +173,9 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
        return devices;
 }
 
-static GSList *scan_norma_dmm(GSList *options)
+static GSList *dev_list(const struct sr_dev_driver *di)
 {
-       return do_scan(&norma_dmm_driver_info, options);
-}
-
-static GSList *scan_siemens_b102x(GSList *options)
-{
-       return do_scan(&siemens_b102x_driver_info, options);
-}
-
-static GSList *dev_list_norma_dmm(void)
-{
-       return ((struct drv_context *)(norma_dmm_driver_info.priv))->instances;
-}
-
-static GSList *dev_list_siemens_b102x(void)
-{
-       return ((struct drv_context *)(siemens_b102x_driver_info.priv))->instances;
+       return ((struct drv_context *)(di->context))->instances;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
@@ -217,14 +194,9 @@ static int dev_close(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int cleanup_norma_dmm(void)
+static int cleanup(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(&norma_dmm_driver_info, NULL);
-}
-
-static int cleanup_siemens_b102x(void)
-{
-       return std_dev_clear(&siemens_b102x_driver_info, NULL);
+       return std_dev_clear(di, NULL);
 }
 
 static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
@@ -244,18 +216,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 
        switch (key) {
        case SR_CONF_LIMIT_MSEC:
-               if (g_variant_get_uint64(data) == 0) {
-                       sr_err("LIMIT_MSEC can't be 0.");
-                       return SR_ERR;
-               }
                devc->limit_msec = g_variant_get_uint64(data);
-               sr_dbg("Setting time limit to %" PRIu64 "ms.",
-                      devc->limit_msec);
                break;
        case SR_CONF_LIMIT_SAMPLES:
                devc->limit_samples = g_variant_get_uint64(data);
-               sr_dbg("Setting sample limit to %" PRIu64 ".",
-                      devc->limit_samples);
                break;
        default:
                return SR_ERR_NA;
@@ -331,10 +295,10 @@ SR_PRIV struct sr_dev_driver norma_dmm_driver_info = {
        .name = "norma-dmm",
        .longname = "Norma DM9x0 DMMs",
        .api_version = 1,
-       .init = init_norma_dmm,
-       .cleanup = cleanup_norma_dmm,
-       .scan = scan_norma_dmm,
-       .dev_list = dev_list_norma_dmm,
+       .init = init,
+       .cleanup = cleanup,
+       .scan = scan,
+       .dev_list = dev_list,
        .dev_clear = NULL,
        .config_get = NULL,
        .config_set = config_set,
@@ -343,18 +307,17 @@ SR_PRIV struct sr_dev_driver norma_dmm_driver_info = {
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };
 
-
 SR_PRIV struct sr_dev_driver siemens_b102x_driver_info = {
        .name = "siemens-b102x",
        .longname = "Siemens B102x DMMs",
        .api_version = 1,
-       .init = init_siemens_b102x,
-       .cleanup = cleanup_siemens_b102x,
-       .scan = scan_siemens_b102x,
-       .dev_list = dev_list_siemens_b102x,
+       .init = init,
+       .cleanup = cleanup,
+       .scan = scan,
+       .dev_list = dev_list,
        .dev_clear = NULL,
        .config_get = NULL,
        .config_set = config_set,
@@ -363,5 +326,5 @@ SR_PRIV struct sr_dev_driver siemens_b102x_driver_info = {
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };