hantek-dso: use driver-private storage for instances and libusb_context

[libsigrok.git] / hardware / hantek-dso / dso.h

diff --git a/hardware/hantek-dso/dso.h b/hardware/hantek-dso/dso.h
index 38ef61bf1fe63c8354eff444ef1decee78ed19b2..6d8f8821724b3786f0c305963126a68fa5641c1d 100644 (file)
--- a/hardware/hantek-dso/dso.h
+++ b/hardware/hantek-dso/dso.h
@@ -158,7 +158,12 @@ struct dso_profile {
        char *firmware;
 };
 
-struct context {
+struct drv_context {
+       libusb_context *usb_context;
+       GSList *instances;
+};
+
+struct dev_context {
        const struct dso_profile *profile;
        struct sr_usb_dev_inst *usb;
        void *cb_data;
@@ -205,12 +210,12 @@ struct 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 context *ctx);
-SR_PRIV int dso_force_trigger(struct context *ctx);
-SR_PRIV int dso_init(struct context *ctx);
-SR_PRIV int dso_get_capturestate(struct context *ctx, uint8_t *capturestate,
+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, uint8_t *capturestate,
                uint32_t *trigger_offset);
-SR_PRIV int dso_capture_start(struct context *ctx);
-SR_PRIV int dso_get_channeldata(struct context *ctx, libusb_transfer_cb_fn cb);
+SR_PRIV int dso_capture_start(struct dev_context *devc);
+SR_PRIV int dso_get_channeldata(struct dev_context *devc, libusb_transfer_cb_fn cb);
 
 #endif