#define USB_CONFIGURATION 1
#define DSO_EP_IN 0x86
#define DSO_EP_OUT 0x02
+#define NUM_PROBES 2
/* FX2 renumeration delay in ms */
-#define MAX_RENUM_DELAY 3000
+#define MAX_RENUM_DELAY_MS 3000
#define MAX_CAPTURE_EMPTY 3
IDLE,
NEW_CAPTURE,
CAPTURE,
- FETCH_DATA
+ FETCH_DATA,
+ STOPPING,
};
struct dso_profile {
uint16_t fw_pid;
char *vendor;
char *model;
- char *model_version;
- int num_probes;
char *firmware;
};
-struct context {
+struct drv_context {
+ GSList *instances;
+};
+
+struct dev_context {
const struct dso_profile *profile;
struct sr_usb_dev_inst *usb;
void *cb_data;
* after the upgrade) this is like a global lock. No device will open
* until a proper delay after the last device was upgraded.
*/
- GTimeVal fw_updated;
+ int64_t fw_updated;
int epin_maxpacketsize;
int capture_empty_count;
int dev_state;
unsigned char *framebuf;
};
-SR_PRIV int dso_open(int dev_index);
+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