X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsession.c;h=ad39ddcf54f457212637d120caaec55fa5cc4a52;hb=5753d2e84b9fdba71c9878c7c64a983218fc4195;hp=c88e48c74e49c159c85fdc0e946d7774e4e3f1a2;hpb=f200d59ee21a42998752c4319d4ff48e129c95c5;p=libsigrok.git diff --git a/src/session.c b/src/session.c index c88e48c7..ad39ddcf 100644 --- a/src/session.c +++ b/src/session.c @@ -365,7 +365,7 @@ SR_API int sr_session_dev_add(struct sr_session *session, sr_strerror(ret)); return ret; } - if ((ret = sdi->driver->dev_acquisition_start(sdi)) != SR_OK) { + if ((ret = sr_dev_acquisition_start(sdi)) != SR_OK) { sr_err("Failed to start acquisition of device in " "running session (%s)", sr_strerror(ret)); return ret; @@ -816,7 +816,7 @@ SR_API int sr_session_start(struct sr_session *session) ret = SR_ERR; break; } - ret = sdi->driver->dev_acquisition_start(sdi); + ret = sr_dev_acquisition_start(sdi); if (ret != SR_OK) { sr_err("Could not start %s device %s acquisition.", sdi->driver->name, sdi->connection_id); @@ -830,7 +830,7 @@ SR_API int sr_session_start(struct sr_session *session) lend = l->next; for (l = session->devs; l != lend; l = l->next) { sdi = l->data; - sdi->driver->dev_acquisition_stop(sdi); + sr_dev_acquisition_stop(sdi); } /* TODO: Handle delayed stops. Need to iterate the event * sources... */ @@ -913,8 +913,7 @@ static gboolean session_stop_sync(void *user_data) for (node = session->devs; node; node = node->next) { sdi = node->data; - if (sdi->driver && sdi->driver->dev_acquisition_stop) - sdi->driver->dev_acquisition_stop(sdi); + sr_dev_acquisition_stop(sdi); } return G_SOURCE_REMOVE;