X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fikalogic-scanaplus%2Fprotocol.c;h=c0e253626a67370b72afa060b6aa025946911bdb;hb=8bf18daabbf3cb0fec6c178b4bc7f6283a314e45;hp=9e9b0ea5ca08a96dcadbb3554848380e23becd07;hpb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;p=libsigrok.git diff --git a/src/hardware/ikalogic-scanaplus/protocol.c b/src/hardware/ikalogic-scanaplus/protocol.c index 9e9b0ea5..c0e25362 100644 --- a/src/hardware/ikalogic-scanaplus/protocol.c +++ b/src/hardware/ikalogic-scanaplus/protocol.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 . */ #include @@ -320,7 +319,7 @@ SR_PRIV int scanaplus_receive_data(int fd, int revents, void *cb_data) if (bytes_read < 0) { sr_err("Failed to read FTDI data (%d): %s.", bytes_read, ftdi_get_error_string(devc->ftdic)); - sdi->driver->dev_acquisition_stop(sdi); + sr_dev_acquisition_stop(sdi); return FALSE; } if (bytes_read == 0) { @@ -359,12 +358,12 @@ SR_PRIV int scanaplus_receive_data(int fd, int revents, void *cb_data) if (devc->limit_samples && (n >= devc->limit_samples)) { send_samples(sdi, devc->limit_samples - devc->samples_sent); sr_info("Requested number of samples reached."); - sdi->driver->dev_acquisition_stop(sdi); + sr_dev_acquisition_stop(sdi); return TRUE; } else if (devc->limit_msec && (n >= max)) { send_samples(sdi, max - devc->samples_sent); sr_info("Requested time limit reached."); - sdi->driver->dev_acquisition_stop(sdi); + sr_dev_acquisition_stop(sdi); return TRUE; } else { send_samples(sdi, devc->bytes_received / 2);