X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fstd.c;h=87b3f1f137d5950116aeaf1b8b91cd0127715567;hb=841aadc95b918fd883d36c6c8555f8cb0e3cd049;hp=218f8f3f2f9490a735801125aecf4ecc97a37739;hpb=15f96409dc54fd2ef784c59156daedd9acfa78ed;p=libsigrok.git
diff --git a/src/std.c b/src/std.c
index 218f8f3f..87b3f1f1 100644
--- a/src/std.c
+++ b/src/std.c
@@ -14,14 +14,16 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
-/** @file
- * Standard API helper functions.
- * @internal
- */
+/**
+ * @file
+ *
+ * Standard API helper functions.
+ *
+ * @internal
+ */
#include
#include
@@ -91,7 +93,7 @@ SR_PRIV int std_cleanup(const struct sr_dev_driver *di)
*/
SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi)
{
- const char *prefix = sdi->driver->name;
+ const char *prefix = (sdi->driver) ? sdi->driver->name : "unknown";
int ret;
struct sr_datafeed_packet packet;
struct sr_datafeed_header header;
@@ -123,7 +125,7 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi)
*/
SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi)
{
- const char *prefix = sdi->driver->name;
+ const char *prefix = (sdi->driver) ? sdi->driver->name : "unknown";
int ret;
struct sr_datafeed_packet packet;
@@ -203,17 +205,13 @@ 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.
*
* @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)
+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;
@@ -231,7 +229,7 @@ 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;
}