X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fstd.c;h=df7a17495ed8dda02952f6943197257842a6d66d;hb=f670835f1fbc03525e995d6970a5495976ab7c1a;hp=218f8f3f2f9490a735801125aecf4ecc97a37739;hpb=15f96409dc54fd2ef784c59156daedd9acfa78ed;p=libsigrok.git

diff --git a/src/std.c b/src/std.c
index 218f8f3f..df7a1749 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 <http://www.gnu.org/licenses/>.
  */
 
-/** @file
-  * Standard API helper functions.
-  * @internal
-  */
+/**
+ * @file
+ *
+ * Standard API helper functions.
+ *
+ * @internal
+ */
 
 #include <config.h>
 #include <glib.h>
@@ -91,13 +93,11 @@ 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;
 
-	sr_dbg("%s: Starting acquisition.", prefix);
-
 	/* Send header packet to the session bus. */
 	sr_dbg("%s: Sending SR_DF_HEADER packet.", prefix);
 	packet.type = SR_DF_HEADER;
@@ -123,7 +123,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,35 +203,24 @@ 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;
 	int ret;
 
-	if (sdi->status != SR_ST_ACTIVE) {
-		sr_err("%s: Device inactive, can't stop acquisition.", prefix);
-		return SR_ERR_DEV_CLOSED;
-	}
-
-	sr_dbg("%s: Stopping acquisition.", prefix);
-
 	if ((ret = serial_source_remove(sdi->session, serial)) < 0) {
 		sr_err("%s: Failed to remove source: %d.", prefix, ret);
 		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;
 	}