Add Rigol DS1052E/1102E VID:PID

[libsigrok.git] / std.c

diff --git a/std.c b/std.c
index d436436cf6b77e03be31b4c0a5f8dc0298e2731c..5eb2e57d8e9808f19c1e13588484f92ead7592d4 100644 (file)
--- a/std.c
+++ b/std.c
@@ -99,3 +99,63 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,
 
        return SR_OK;
 }
+
+/*
+ * Standard sr_session_stop() API helper.
+ *
+ * This function can be used to simplify most (serial port based) driver's
+ * hw_dev_acquisition_stop() API callback.
+ *
+ * @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 hw_dev_close_fn Function pointer to the driver's hw_dev_close().
+ *                       Must not be NULL.
+ * @param serial The serial device instance (struct serial_dev_inst *).
+ *               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_hw_dev_acquisition_stop_serial(struct sr_dev_inst *sdi,
+                       void *cb_data, dev_close_t hw_dev_close_fn,
+                       struct sr_serial_dev_inst *serial, const char *prefix)
+{
+       int ret;
+       struct sr_datafeed_packet packet;
+
+       if (!prefix) {
+               sr_err("Invalid prefix.");
+               return SR_ERR_ARG;
+       }
+
+       if (sdi->status != SR_ST_ACTIVE) {
+               sr_err("%sDevice inactive, can't stop acquisition.", prefix);
+               return SR_ERR;
+       }
+
+       sr_dbg("%sStopping acquisition.", prefix);
+
+       if ((ret = sr_source_remove(serial->fd)) < 0) {
+               sr_err("%sFailed to remove source: %d.", prefix, ret);
+               return ret;
+       }
+
+       if ((ret = hw_dev_close_fn(sdi)) < 0) {
+               sr_err("%sFailed to close device: %d.", prefix, ret);
+               return ret;
+       }
+
+       /* Send SR_DF_END packet to the session bus. */
+       sr_dbg("%sSending SR_DF_END packet.", prefix);
+       packet.type = SR_DF_END;
+       packet.payload = NULL;
+       if ((ret = sr_session_send(cb_data, &packet)) < 0) {
+               sr_err("%sFailed to send SR_DF_END packet: %d.", prefix, ret);
+               return ret;
+       }
+
+       return SR_OK;
+}