/*
* This file is part of the sigrok project.
*
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
* Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
*
* This program is free software: you can redistribute it and/or modify
#define NUM_TRIGGER_STAGES 4
#define TRIGGER_TYPES "01"
-#define MAX_RENUM_DELAY 3000 /* ms */
+#define MAX_RENUM_DELAY_MS 3000
#define NUM_SIMUL_TRANSFERS 32
#define MAX_EMPTY_TRANSFERS (NUM_SIMUL_TRANSFERS * 2)
-#define FX2LAFW_VERSION_MAJOR 1
-#define FX2LAFW_VERSION_MINOR 0
+#define FX2LAFW_REQUIRED_VERSION_MAJOR 1
+
+#define MAX_8BIT_SAMPLE_RATE SR_MHZ(24)
+#define MAX_16BIT_SAMPLE_RATE SR_MHZ(12)
/* 6 delay states of up to 256 clock ticks */
#define MAX_SAMPLE_DELAY (6 * 256)
/* Software trigger implementation: positive values indicate trigger stage. */
#define TRIGGER_FIRED -1
+#define DEV_CAPS_16BIT_POS 0
+
+#define DEV_CAPS_16BIT (1 << DEV_CAPS_16BIT_POS)
+
struct fx2lafw_profile {
uint16_t vid;
uint16_t pid;
const char *firmware;
- int num_probes;
+ uint32_t dev_caps;
};
struct context {
*/
int64_t fw_updated;
- /* Device/Capture Settings */
+ /* Device/capture settings */
uint64_t cur_samplerate;
uint64_t limit_samples;
- uint8_t trigger_mask[NUM_TRIGGER_STAGES];
- uint8_t trigger_value[NUM_TRIGGER_STAGES];
+ gboolean sample_wide;
+
+ uint16_t trigger_mask[NUM_TRIGGER_STAGES];
+ uint16_t trigger_value[NUM_TRIGGER_STAGES];
int trigger_stage;
- uint8_t trigger_buffer[NUM_TRIGGER_STAGES];
+ uint16_t trigger_buffer[NUM_TRIGGER_STAGES];
int num_samples;
int submitted_transfers;
+ int empty_transfer_count;
void *session_dev_id;
struct sr_usb_dev_inst *usb;
+
+ unsigned int num_transfers;
+ struct libusb_transfer **transfers;
};
#endif