X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhantek-dso%2Fdso.h;h=eaa37e788f95b2a0241a98157f8b2e9e3aac645b;hb=48535594664cc5d55db428cd8ca5ffba328be05a;hp=b4f563464fda352a8b57fc3f976e50596c4308d4;hpb=034accb512e43172ee292d1585870db9e2477ed0;p=libsigrok.git diff --git a/hardware/hantek-dso/dso.h b/hardware/hantek-dso/dso.h index b4f56346..eaa37e78 100644 --- a/hardware/hantek-dso/dso.h +++ b/hardware/hantek-dso/dso.h @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * * Copyright (C) 2012 Bert Vermeulen * With protocol information from the hantekdso project, @@ -169,7 +169,6 @@ struct dso_profile { struct dev_context { const struct dso_profile *profile; - struct sr_usb_dev_inst *usb; void *cb_data; uint64_t limit_frames; uint64_t num_frames; @@ -215,12 +214,12 @@ struct dev_context { SR_PRIV int dso_open(struct sr_dev_inst *sdi); SR_PRIV void dso_close(struct sr_dev_inst *sdi); -SR_PRIV int dso_enable_trigger(struct dev_context *devc); -SR_PRIV int dso_force_trigger(struct dev_context *devc); -SR_PRIV int dso_init(struct dev_context *devc); -SR_PRIV int dso_get_capturestate(struct dev_context *devc, +SR_PRIV int dso_enable_trigger(const struct sr_dev_inst *sdi); +SR_PRIV int dso_force_trigger(const struct sr_dev_inst *sdi); +SR_PRIV int dso_init(const struct sr_dev_inst *sdi); +SR_PRIV int dso_get_capturestate(const struct sr_dev_inst *sdi, uint8_t *capturestate, uint32_t *trigger_offset); -SR_PRIV int dso_capture_start(struct dev_context *devc); +SR_PRIV int dso_capture_start(const struct sr_dev_inst *sdi); SR_PRIV int dso_get_channeldata(const struct sr_dev_inst *sdi, libusb_transfer_cb_fn cb);