X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhp-3457a%2Fprotocol.c;h=f0197290f3b6d0e4825194335309d8a1a0df8d42;hb=98c7ef378c707bfda3d6e7850700953e4286f9af;hp=dd8d6f8fdbeb75df1f3873fe5e68d5f27036a156;hpb=d9251a2c9f1ca4380c27240ccca90c9f9ed46d3f;p=libsigrok.git diff --git a/src/hardware/hp-3457a/protocol.c b/src/hardware/hp-3457a/protocol.c index dd8d6f8f..f0197290 100644 --- a/src/hardware/hp-3457a/protocol.c +++ b/src/hardware/hp-3457a/protocol.c @@ -25,6 +25,7 @@ static int set_mq_volt(struct sr_scpi_dev_inst *scpi, enum sr_mqflag flags); static int set_mq_amp(struct sr_scpi_dev_inst *scpi, enum sr_mqflag flags); static int set_mq_ohm(struct sr_scpi_dev_inst *scpi, enum sr_mqflag flags); + /* * The source for the frequency measurement can be either AC voltage, AC+DC * voltage, AC current, or AC+DC current. Configuring this is not yet @@ -435,7 +436,7 @@ SR_PRIV int hp_3457a_receive_data(int fd, int revents, void *cb_data) ret = sr_scpi_get_double(scpi, NULL, &devc->last_channel_sync); if (ret != SR_OK) { sr_err("Cannot check channel synchronization."); - sdi->driver->dev_acquisition_stop(sdi); + sr_dev_acquisition_stop(sdi); return FALSE; } devc->acq_state = ACQ_GOT_CHANNEL_SYNC; @@ -456,7 +457,7 @@ SR_PRIV int hp_3457a_receive_data(int fd, int revents, void *cb_data) sr_err("Expected channel %u, but device says %u", chanc->index, (unsigned int)devc->last_channel_sync); - sdi->driver->dev_acquisition_stop(sdi); + sr_dev_acquisition_stop(sdi); return FALSE; } /* All is good. Back to business. */ @@ -464,7 +465,7 @@ SR_PRIV int hp_3457a_receive_data(int fd, int revents, void *cb_data) } if (devc->limit_samples && (devc->num_samples >= devc->limit_samples)) { - sdi->driver->dev_acquisition_stop(sdi); + sr_dev_acquisition_stop(sdi); return FALSE; }