X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fstd.c;h=7cd2313129456605a970924232b0ec990a8e04a7;hb=4b1a9d5d8641080bf10e269aa12a3fc17460365f;hp=4af3c6816266aa91ed097957f1583614c888a7a3;hpb=15a5bfe4815f9991a9bb532c05d6244a1818a0e4;p=libsigrok.git

diff --git a/src/std.c b/src/std.c
index 4af3c681..7cd23131 100644
--- a/src/std.c
+++ b/src/std.c
@@ -85,24 +85,17 @@ SR_PRIV int std_cleanup(const struct sr_dev_driver *di)
  * dev_acquisition_start() API callback.
  *
  * @param sdi The device instance to use.
- * @param prefix A driver-specific prefix string used for log messages.
- * 		 Must not be NULL. An empty string is allowed.
  *
  * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
  *         SR_ERR upon other errors.
  */
-SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,
-				       const char *prefix)
+SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi)
 {
+	const char *prefix = sdi->driver->name;
 	int ret;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_header header;
 
-	if (!prefix) {
-		sr_err("Invalid prefix.");
-		return SR_ERR_ARG;
-	}
-
 	sr_dbg("%s: Starting acquisition.", prefix);
 
 	/* Send header packet to the session bus. */
@@ -124,19 +117,17 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,
  * Standard API helper for sending an SR_DF_END packet.
  *
  * @param sdi The device instance to use. Must not be NULL.
- * @param prefix A driver-specific prefix string used for log messages.
- * 		 Must not be NULL. An empty string is allowed.
  *
  * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
  *         SR_ERR upon other errors.
  */
-SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi,
-				    const char *prefix)
+SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi)
 {
+	const char *prefix = sdi->driver->name;
 	int ret;
 	struct sr_datafeed_packet packet;
 
-	if (!sdi || !prefix)
+	if (!sdi)
 		return SR_ERR_ARG;
 
 	sr_dbg("%s: Sending SR_DF_END packet.", prefix);
@@ -212,30 +203,18 @@ SR_PRIV int std_serial_dev_close(struct sr_dev_inst *sdi)
  *
  * @param sdi The device instance for which acquisition should stop.
  *            Must not be NULL.
- * @param cb_data Opaque 'cb_data' pointer. Must not be NULL.
- * @param dev_close_fn Function pointer to the driver's dev_close().
- *               	  Must not be NULL.
- * @param serial The serial device instance (struct serial_dev_inst *).
- *               Must not be NULL.
- * @param[in] prefix A driver-specific prefix string used for log messages.
- *               Must not be NULL. An empty string is allowed.
  *
  * @retval SR_OK Success.
  * @retval SR_ERR_ARG Invalid arguments.
  * @retval SR_ERR_DEV_CLOSED Device is closed.
  * @retval SR_ERR Other errors.
  */
-SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
-			dev_close_callback dev_close_fn,
-			struct sr_serial_dev_inst *serial, const char *prefix)
+SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
+	struct sr_serial_dev_inst *serial = sdi->conn;
+	const char *prefix = sdi->driver->name;
 	int ret;
 
-	if (!prefix) {
-		sr_err("Invalid prefix.");
-		return SR_ERR_ARG;
-	}
-
 	if (sdi->status != SR_ST_ACTIVE) {
 		sr_err("%s: Device inactive, can't stop acquisition.", prefix);
 		return SR_ERR_DEV_CLOSED;
@@ -248,12 +227,12 @@ SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
 		return ret;
 	}
 
-	if ((ret = dev_close_fn(sdi)) < 0) {
+	if ((ret = sdi->driver->dev_close(sdi)) < 0) {
 		sr_err("%s: Failed to close device: %d.", prefix, ret);
 		return ret;
 	}
 
-	std_session_send_df_end(sdi, prefix);
+	std_session_send_df_end(sdi);
 
 	return SR_OK;
 }
@@ -378,18 +357,29 @@ SR_PRIV GSList *std_dev_list(const struct sr_dev_driver *di)
  * }
  * @endcode
  *
- * @param di The driver instance to use.
+ * @param di The driver instance to use. Must not be NULL.
  * @param devices List of newly discovered devices (struct sr_dev_inst).
  *
  * @return The @p devices list.
  */
 SR_PRIV GSList *std_scan_complete(struct sr_dev_driver *di, GSList *devices)
 {
-	struct drv_context *drvc = di->context;
+	struct drv_context *drvc;
 	GSList *l;
 
+	if (!di) {
+		sr_err("Invalid driver instance (di), cannot complete scan.");
+		return NULL;
+	}
+
+	drvc = di->context;
+
 	for (l = devices; l; l = l->next) {
 		struct sr_dev_inst *sdi = l->data;
+		if (!sdi) {
+			sr_err("Invalid driver instance, cannot complete scan.");
+			return NULL;
+		}
 		sdi->driver = di;
 	}