struct sr_input {
struct sr_input_format *format;
GHashTable *param;
- struct sr_dev *vdev;
+ struct sr_dev_inst *sdi;
void *internal;
};
struct sr_output {
struct sr_output_format *format;
- struct sr_dev *dev;
+ struct sr_dev_inst *sdi;
char *param;
void *internal;
};
};
enum {
- SR_PROBE_TYPE_LOGIC,
+ SR_PROBE_LOGIC,
+ SR_PROBE_ANALOG,
};
struct sr_probe {
/* Hardware driver options */
enum {
+ SR_HWOPT_DUMMY = 0, /* Used to terminate lists. Must be 0! */
+
/** Some drivers cannot detect the exact model they're talking to. */
SR_HWOPT_MODEL,
/** The device supports setting/changing its samplerate. */
SR_HWCAP_SAMPLERATE,
- /* TODO: Better description? Rename to PROBE_AND_TRIGGER_CONFIG? */
- /** The device supports setting a probe mask. */
- SR_HWCAP_PROBECONFIG,
-
/** The device supports setting a pre/post-trigger capture ratio. */
SR_HWCAP_CAPTURE_RATIO,
};
struct sr_dev_inst {
+ struct sr_dev_driver *driver;
int index;
int status;
int inst_type;
char *vendor;
char *model;
char *version;
+ GSList *probes;
void *priv;
};
/* Device info IDs */
enum {
- /* struct sr_dev_inst for this specific device */
- SR_DI_INST,
+ /* A list of options supported by the driver. */
+ SR_DI_HWOPTS,
+ /* A list of capabilities supported by the device. */
+ SR_DI_HWCAPS,
/* The number of probes connected to this device */
SR_DI_NUM_PROBES,
/* The probe names on this device */
int api_version;
int (*init) (void);
int (*cleanup) (void);
- int (*scan) (void);
+ GSList *(*scan) (GSList *options);
/* Device-specific */
- int (*dev_open) (int dev_index);
- int (*dev_close) (int dev_index);
- const void *(*dev_info_get) (int dev_index, int dev_info_id);
- int (*dev_status_get) (int dev_index);
- const int *(*hwcap_get_all) (void);
- int (*dev_config_set) (int dev_index, int hwcap, const void *value);
- int (*dev_acquisition_start) (int dev_index, void *session_dev_id);
- int (*dev_acquisition_stop) (int dev_index, void *session_dev_id);
+ int (*dev_open) (struct sr_dev_inst *sdi);
+ int (*dev_close) (struct sr_dev_inst *sdi);
+ int (*info_get) (int info_id, const void **data,
+ const struct sr_dev_inst *sdi);
+ int (*dev_config_set) (const struct sr_dev_inst *sdi, int hwcap,
+ const void *value);
+ int (*dev_acquisition_start) (const struct sr_dev_inst *sdi,
+ void *cb_data);
+ int (*dev_acquisition_stop) (const struct sr_dev_inst *sdi,
+ void *cb_data);
+
+ /* Dynamic */
+ void *priv;
};
struct sr_session {
/* list of sr_receive_data_callback_t */
GSList *datafeed_callbacks;
GTimeVal starttime;
- gboolean running;
unsigned int num_sources;