X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fstd.c;h=b9757381291236083ba6acfd8c75ad3d556b47c1;hp=2319dfef9273f47524fd61bcebb7535f8f21135b;hb=c1aae90038456a61d0f9313d34e6107c3440d3e7;hpb=155b680da482cea2381becb73c51cfb838bff31e

diff --git a/src/std.c b/src/std.c
index 2319dfef..b9757381 100644
--- 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;
 }
@@ -115,7 +110,7 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,
  *
  * This function can be used to implement the dev_open() driver API
  * callback in drivers that use a serial port. The port is opened
- * with the SERIAL_RDWR and SERIAL_NONBLOCK flags.
+ * with the SERIAL_RDWR flag.
  *
  * If the open succeeded, the status field of the given sdi is set
  * to SR_ST_ACTIVE.
@@ -128,7 +123,7 @@ SR_PRIV int std_serial_dev_open(struct sr_dev_inst *sdi)
 	struct sr_serial_dev_inst *serial;
 
 	serial = sdi->conn;
-	if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+	if (serial_open(serial, SERIAL_RDWR) != SR_OK)
 		return SR_ERR;
 
 	sdi->status = SR_ST_ACTIVE;
@@ -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,11 +271,16 @@ 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
+			 * its own sdi->priv! */
 			clear_private(sdi->priv);
 		else
 			g_free(sdi->priv);
+
 		sr_dev_inst_free(sdi);
 	}