X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkecheng-kc-330b%2Fprotocol.c;h=1bbe5746b36ec2fe666afc23202c13dc93166829;hb=24931412eeee31e5c0bb5291a9c73e7b57309216;hp=886be6f742c013e4bab8922179aa409288812ec6;hpb=53b4ea3921a004432d9531ef3b0d9883c2be634e;p=libsigrok.git diff --git a/src/hardware/kecheng-kc-330b/protocol.c b/src/hardware/kecheng-kc-330b/protocol.c index 886be6f7..1bbe5746 100644 --- a/src/hardware/kecheng-kc-330b/protocol.c +++ b/src/hardware/kecheng-kc-330b/protocol.c @@ -20,6 +20,7 @@ #include #include #include "protocol.h" + extern const uint64_t kecheng_kc_330b_sample_intervals[][2]; SR_PRIV int kecheng_kc_330b_handle_events(int fd, int revents, void *cb_data) @@ -67,7 +68,7 @@ SR_PRIV int kecheng_kc_330b_handle_events(int fd, int revents, void *cb_data) if (ret != 0 || len != 1) { sr_dbg("Failed to request new acquisition: %s", libusb_error_name(ret)); - sdi->driver->dev_acquisition_stop(sdi); + sr_dev_acquisition_stop(sdi); return TRUE; } libusb_submit_transfer(devc->xfer); @@ -88,7 +89,7 @@ SR_PRIV int kecheng_kc_330b_handle_events(int fd, int revents, void *cb_data) if (ret != 0 || len != 4) { sr_dbg("Failed to request next chunk: %s", libusb_error_name(ret)); - sdi->driver->dev_acquisition_stop(sdi); + sr_dev_acquisition_stop(sdi); return TRUE; } libusb_submit_transfer(devc->xfer); @@ -135,7 +136,7 @@ SR_PRIV void LIBUSB_CALL kecheng_kc_330b_receive_transfer(struct libusb_transfer switch (transfer->status) { case LIBUSB_TRANSFER_NO_DEVICE: /* USB device was unplugged. */ - sdi->driver->dev_acquisition_stop(sdi); + sr_dev_acquisition_stop(sdi); return; case LIBUSB_TRANSFER_COMPLETED: case LIBUSB_TRANSFER_TIMED_OUT: /* We may have received some data though */ @@ -156,7 +157,7 @@ SR_PRIV void LIBUSB_CALL kecheng_kc_330b_receive_transfer(struct libusb_transfer send_data(sdi, fvalue, 1); devc->num_samples++; if (devc->limit_samples && devc->num_samples >= devc->limit_samples) { - sdi->driver->dev_acquisition_stop(sdi); + sr_dev_acquisition_stop(sdi); } else { /* let USB event handler fire off another * request when the time is right. */ @@ -176,7 +177,7 @@ SR_PRIV void LIBUSB_CALL kecheng_kc_330b_receive_transfer(struct libusb_transfer send_data(sdi, fvalue, 1); devc->num_samples += num_samples; if (devc->num_samples >= devc->stored_samples) { - sdi->driver->dev_acquisition_stop(sdi); + sr_dev_acquisition_stop(sdi); } else { /* let USB event handler fire off another * request when the time is right. */