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 bf44df2756da534b9e00349e49c31c9d105936f9..c86f9c7d40a48ec4259a8a45bef17585615e3f8a 100644 (file)
--- a/src/hardware/norma-dmm/api.c
+++ b/src/hardware/norma-dmm/api.c
@@ -113,10 +113,7 @@ static GSList *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);
@@ -178,7 +175,7 @@ static GSList *scan(struct sr_dev_driver* drv, 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_close(struct sr_dev_inst *sdi)
@@ -310,7 +307,7 @@ 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 = {
@@ -329,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,
 };