X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fasix-sigma%2Fapi.c;h=506b6f658f70299cc1bf2990b0fd1c7cbce4573d;hb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;hp=8b798d4ecdb91f9756c78166c8f01faf07b175c1;hpb=3ba56876b4a5469b0c39a6f162f517ce8610b9e4;p=libsigrok.git diff --git a/src/hardware/asix-sigma/api.c b/src/hardware/asix-sigma/api.c index 8b798d4e..506b6f65 100644 --- a/src/hardware/asix-sigma/api.c +++ b/src/hardware/asix-sigma/api.c @@ -301,7 +301,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * return SR_OK; } -static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_start(const struct sr_dev_inst *sdi) { struct dev_context *devc; struct clockselect_50 clockselect; @@ -334,7 +334,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) sigma_set_register(WRITE_TRIGGER_SELECT1, 0x81, devc); /* Find which pin to trigger on from mask. */ - for (triggerpin = 0; triggerpin < 8; ++triggerpin) + for (triggerpin = 0; triggerpin < 8; triggerpin++) if ((devc->trigger.risingmask | devc->trigger.fallingmask) & (1 << triggerpin)) break; @@ -398,9 +398,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) gettimeofday(&devc->start_tv, 0); sigma_set_register(WRITE_MODE, 0x0d, devc); - devc->cb_data = cb_data; - - /* Send header packet to the session bus. */ std_session_send_df_header(sdi, LOG_PREFIX); /* Add capture source. */ @@ -411,12 +408,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) return SR_OK; } -static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_stop(struct sr_dev_inst *sdi) { struct dev_context *devc; - (void)cb_data; - devc = sdi->priv; devc->state.state = SIGMA_IDLE;