X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fgenericdmm%2Fapi.c;h=e4de064ddc2647ead7ce2fb3fa389ffc633a3ccb;hb=3ffb6964a1585b5f6ffa0747c089a1cd557e4feb;hp=c182b039d1110dea7520d6c70c8c2622e64619f2;hpb=25a0f108f4512ade836fed128c3ad649dedcb788;p=libsigrok.git diff --git a/hardware/genericdmm/api.c b/hardware/genericdmm/api.c index c182b039..e4de064d 100644 --- a/hardware/genericdmm/api.c +++ b/hardware/genericdmm/api.c @@ -536,19 +536,14 @@ static int receive_data(int fd, int revents, void *cb_data) return TRUE; } -static int hw_dev_acquisition_start(int dev_index, void *cb_data) +static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, + void *cb_data) { struct sr_datafeed_packet packet; struct sr_datafeed_header header; struct sr_datafeed_meta_analog meta; - struct sr_dev_inst *sdi; struct context *ctx; - if (!(sdi = sr_dev_inst_get(gdi->instances, dev_index))) { - sr_err("genericdmm: sdi was NULL."); - return SR_ERR_BUG; - } - if (!(ctx = sdi->priv)) { sr_err("genericdmm: sdi->priv was NULL."); return SR_ERR_BUG; @@ -587,12 +582,13 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data) return SR_OK; } -static int hw_dev_acquisition_stop(int dev_index, void *cb_data) +static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi, + void *cb_data) { struct sr_datafeed_packet packet; /* Avoid compiler warnings. */ - (void)dev_index; + (void)sdi; sr_dbg("genericdmm: Stopping acquisition.");