X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbaylibre-acme%2Fapi.c;h=0dd6fdba51f9134b981f892d5b97391ff77f7dcf;hb=3be42bc22f8b36599a448273c12a76d3e0f7a940;hp=6cbae3880bd10e2152ba81944e0f41b30e2b20f8;hpb=d586a7f4bd0d83a1e432d5ca1ee63af94bdb4e13;p=libsigrok.git diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c index 6cbae388..0dd6fdba 100644 --- a/src/hardware/baylibre-acme/api.c +++ b/src/hardware/baylibre-acme/api.c @@ -17,6 +17,7 @@ * along with this program. If not, see . */ +#include #include "protocol.h" #include #include @@ -68,7 +69,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) (void)options; - drvc = di->priv; + drvc = di->context; devices = NULL; devc = g_malloc0(sizeof(struct dev_context)); @@ -143,7 +144,7 @@ err_out: static GSList *dev_list(const struct sr_dev_driver *di) { - return ((struct drv_context *)(di->priv))->instances; + return ((struct drv_context *)(di->context))->instances; } static int dev_clear(const struct sr_dev_driver *di) @@ -400,7 +401,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { - struct sr_datafeed_packet packet; struct dev_context *devc; (void)cb_data; @@ -416,12 +416,10 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) g_io_channel_unref(devc->channel); devc->channel = NULL; - /* Send last packet. */ - packet.type = SR_DF_END; - sr_session_send(sdi, &packet); + std_session_send_df_end(sdi, LOG_PREFIX); if (devc->samples_missed > 0) - sr_warn("%d samples missed", devc->samples_missed); + sr_warn("%" PRIu64 " samples missed", devc->samples_missed); return SR_OK; } @@ -442,5 +440,5 @@ SR_PRIV struct sr_dev_driver baylibre_acme_driver_info = { .dev_close = dev_close, .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = dev_acquisition_stop, - .priv = NULL, + .context = NULL, };