X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fappa-55ii%2Fprotocol.c;h=257f60577e99c2c443f49e41f9c8bf5914a5a2b8;hb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;hp=84826890be9ad624ad4f29248e7827099f4d99b5;hpb=208c1d35435626a11afa1ab301b2071b2a4e187b;p=libsigrok.git diff --git a/src/hardware/appa-55ii/protocol.c b/src/hardware/appa-55ii/protocol.c index 84826890..257f6057 100644 --- a/src/hardware/appa-55ii/protocol.c +++ b/src/hardware/appa-55ii/protocol.c @@ -120,7 +120,7 @@ static void appa_55ii_live_data(struct sr_dev_inst *sdi, const uint8_t *buf) packet.type = SR_DF_ANALOG_OLD; packet.payload = &analog; - sr_session_send(devc->session_cb_data, &packet); + sr_session_send(sdi, &packet); g_slist_free(analog.channels); devc->num_samples++; @@ -172,7 +172,7 @@ static void appa_55ii_log_data_parse(struct sr_dev_inst *sdi) packet.type = SR_DF_ANALOG_OLD; packet.payload = &analog; - sr_session_send(devc->session_cb_data, &packet); + sr_session_send(sdi, &packet); g_slist_free(analog.channels); devc->num_samples++; @@ -216,7 +216,7 @@ static void appa_55ii_log_end(struct sr_dev_inst *sdi) if (devc->data_source != DATA_SOURCE_MEMORY) return; - sdi->driver->dev_acquisition_stop(sdi, devc->session_cb_data); + sdi->driver->dev_acquisition_stop(sdi); } static const uint8_t *appa_55ii_parse_data(struct sr_dev_inst *sdi, @@ -303,7 +303,7 @@ SR_PRIV int appa_55ii_receive_data(int fd, int revents, void *cb_data) if (devc->limit_samples && devc->num_samples >= devc->limit_samples) { sr_info("Requested number of samples reached."); - sdi->driver->dev_acquisition_stop(sdi, devc->session_cb_data); + sdi->driver->dev_acquisition_stop(sdi); return TRUE; } @@ -311,8 +311,7 @@ SR_PRIV int appa_55ii_receive_data(int fd, int revents, void *cb_data) time = (g_get_monotonic_time() - devc->start_time) / 1000; if (time > (int64_t)devc->limit_msec) { sr_info("Requested time limit reached."); - sdi->driver->dev_acquisition_stop(sdi, - devc->session_cb_data); + sdi->driver->dev_acquisition_stop(sdi); return TRUE; } }