Build: Set local include directories in Makefile.am

[libsigrok.git] / src / std.c

diff --git a/src/std.c b/src/std.c
index fed47febe3598e15468b0e2433b6decbd362fb48..b9757381291236083ba6acfd8c75ad3d556b47c1 100644 (file)
--- a/src/std.c
+++ b/src/std.c
@@ -24,7 +24,7 @@
   */
 
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "std"
@@ -41,8 +41,7 @@
  * @param di The driver instance to use.
  * @param[in] prefix A driver-specific prefix string used for log messages.
  *
- * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
- *         SR_ERR_MALLOC upon memory allocation errors.
+ * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
  */
 SR_PRIV int std_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
                     const char *prefix)
@@ -54,14 +53,10 @@ SR_PRIV int std_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
                return SR_ERR_ARG;
        }
 
-       if (!(drvc = g_try_malloc(sizeof(struct drv_context)))) {
-               sr_err("%s: Driver context malloc failed.", prefix);
-               return SR_ERR_MALLOC;
-       }
-
+       drvc = g_malloc0(sizeof(struct drv_context));
        drvc->sr_ctx = sr_ctx;
        drvc->instances = NULL;
-       di->priv = drvc;
+       di->context = drvc;
 
        return SR_OK;
 }
@@ -252,7 +247,7 @@ SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver,
        GSList *l;
        int ret;
 
-       if (!(drvc = driver->priv))
+       if (!(drvc = driver->context))
                /* Driver was never initialized, nothing to do. */
                return SR_OK;
 
@@ -276,6 +271,8 @@ SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver,
 #endif
                        if (sdi->inst_type == SR_INST_SCPI)
                                sr_scpi_free(sdi->conn);
+                       if (sdi->inst_type == SR_INST_MODBUS)
+                               sr_modbus_free(sdi->conn);
                }
                if (clear_private)
                        /* The helper function is responsible for freeing