Add sr_dev_acquisition_start(), factor out SR_ERR_DEV_CLOSED check.

[libsigrok.git] / src / std.c

diff --git a/src/std.c b/src/std.c
index 643500f169ee50b88f24045867ff4c81182bf455..df7a17495ed8dda02952f6943197257842a6d66d 100644 (file)
--- a/src/std.c
+++ b/src/std.c
@@ -14,8 +14,7 @@
  * 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/>.
  */
 
 /**
@@ -99,8 +98,6 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi)
        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;
@@ -218,13 +215,6 @@ SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi)
        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;