X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fikalogic-scanalogic2%2Fprotocol.h;h=d7a273574d78276d1504dbb4f616a62d16d42dfa;hb=4b1a9d5d8641080bf10e269aa12a3fc17460365f;hp=66a5cecf57919f0b2a6cbcf50d6d56624bc15805;hpb=c1aae90038456a61d0f9313d34e6107c3440d3e7;p=libsigrok.git diff --git a/src/hardware/ikalogic-scanalogic2/protocol.h b/src/hardware/ikalogic-scanalogic2/protocol.h index 66a5cecf..d7a27357 100644 --- a/src/hardware/ikalogic-scanalogic2/protocol.h +++ b/src/hardware/ikalogic-scanalogic2/protocol.h @@ -147,8 +147,6 @@ struct dev_context { /* Time that the trigger will be delayed in milliseconds. */ uint16_t after_trigger_delay; - void *cb_data; - /* Array to provide an index based access to all channels. */ const struct sr_channel *channels[NUM_CHANNELS]; @@ -229,8 +227,8 @@ SR_PRIV int sl2_set_capture_ratio(const struct sr_dev_inst *sdi, SR_PRIV int sl2_set_after_trigger_delay(const struct sr_dev_inst *sdi, uint64_t after_trigger_delay); SR_PRIV void sl2_calculate_trigger_samples(const struct sr_dev_inst *sdi); -SR_PRIV int sl2_get_device_info(struct sr_usb_dev_inst usb, - struct device_info *dev_info); +SR_PRIV int sl2_get_device_info(struct sr_dev_driver *di, + struct sr_usb_dev_inst usb, struct device_info *dev_info); SR_PRIV int sl2_transfer_in(libusb_device_handle *dev_handle, uint8_t *data); SR_PRIV int sl2_transfer_out(libusb_device_handle *dev_handle, uint8_t *data);