X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fprotocol_wrappers.c;h=5f5b5bfab7478d6461b98980964f14513f571ff4;hb=84ab9da11fc9c1c90667f0e234423d4d306580dd;hp=419420d14b83a508ca0dce5d505ad3f1b1ed91e6;hpb=8ab929d614262dc446ee2e948ca583d31110b14b;p=libsigrok.git diff --git a/src/hardware/yokogawa-dlm/protocol_wrappers.c b/src/hardware/yokogawa-dlm/protocol_wrappers.c index 419420d1..5f5b5bfa 100644 --- a/src/hardware/yokogawa-dlm/protocol_wrappers.c +++ b/src/hardware/yokogawa-dlm/protocol_wrappers.c @@ -92,6 +92,7 @@ int dlm_trigger_slope_get(struct sr_scpi_dev_inst *scpi, } g_free(resp); + return result; } @@ -253,7 +254,6 @@ int dlm_digital_pod_state_set(struct sr_scpi_dev_inst *scpi, int pod, return sr_scpi_send(scpi, ":LOGIC:MODE OFF"); } - int dlm_response_headers_set(struct sr_scpi_dev_inst *scpi, const gboolean value) { @@ -268,11 +268,26 @@ int dlm_acquisition_stop(struct sr_scpi_dev_inst *scpi) return sr_scpi_send(scpi, ":STOP"); } - int dlm_acq_length_get(struct sr_scpi_dev_inst *scpi, - int *response) + uint32_t *response) { - return sr_scpi_get_int(scpi, ":WAVEFORM:LENGTH?", response); + int ret; + char *s; + long tmp; + + if (sr_scpi_get_string(scpi, ":WAVEFORM:LENGTH?", &s) != SR_OK) + if (!s) + return SR_ERR; + + if (sr_atol(s, &tmp) == SR_OK) + ret = SR_OK; + else + ret = SR_ERR; + + g_free(s); + *response = tmp; + + return ret; } int dlm_chunks_per_acq_get(struct sr_scpi_dev_inst *scpi, int *response)