sr/drivers: use sr_dev_inst instead of device index for dev_config_set()

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index 2c0d6f9648a6ee762c85fdf6703e11ee8320e6c0..9a6ec097efdf0d6a61e3d3483bef1240d3f4820a 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -193,8 +193,9 @@ struct sr_datafeed_analog {
 
 struct sr_input {
        struct sr_input_format *format;
-       char *param;
+       GHashTable *param;
        struct sr_dev *vdev;
+       void *internal;
 };
 
 struct sr_input_format {
@@ -249,7 +250,7 @@ struct sr_dev {
 };
 
 enum {
-       SR_PROBE_TYPE_LOGIC,
+       SR_PROBE_LOGIC,
 };
 
 struct sr_probe {
@@ -260,7 +261,26 @@ struct sr_probe {
        char *trigger;
 };
 
-/* Hardware driver capabilities */
+struct sr_hwopt {
+       int hwopt;
+       const void *value;
+};
+
+/* 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,
+
+       /** Specification on how to connect to a device */
+       SR_HWOPT_CONN,
+
+       /** Serial communication spec: <data bits><parity><stop bit> e.g. 8n1 */
+       SR_HWOPT_SERIALCOMM,
+};
+
+/* Hardware device capabilities */
 enum {
        SR_HWCAP_DUMMY = 0, /* Used to terminate lists. Must be 0! */
 
@@ -279,17 +299,6 @@ enum {
        SR_HWCAP_DEMO_DEV,
 
 
-       /*--- Device communication ------------------------------------------*/
-       /** Some drivers cannot detect the exact model they're talking to. */
-       SR_HWCAP_MODEL,
-
-       /** Specification on how to connect to a device */
-       SR_HWCAP_CONN,
-
-       /** Serial communication spec: <data bits><parity><stop bit> e.g. 8n1 */
-       SR_HWCAP_SERIALCOMM,
-
-
        /*--- Device configuration ------------------------------------------*/
 
        /** The device supports setting/changing its samplerate. */
@@ -336,6 +345,9 @@ enum {
 
        /*--- Special stuff -------------------------------------------------*/
 
+       /** Session filename */
+       SR_HWCAP_SESSIONFILE,
+
        /* TODO: Better description. */
        /** The device supports specifying a capturefile to inject. */
        SR_HWCAP_CAPTUREFILE,
@@ -386,12 +398,14 @@ struct sr_hwcap_option {
 };
 
 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;
 };
 
@@ -422,7 +436,12 @@ enum {
 /* Device info IDs */
 enum {
        /* struct sr_dev_inst for this specific device */
+       /* TODO: obsolete */
        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 */
@@ -466,18 +485,25 @@ struct sr_dev_driver {
        char *name;
        char *longname;
        int api_version;
-       int (*init) (const char *devinfo);
+       int (*init) (void);
        int (*cleanup) (void);
+       GSList *(*scan) (GSList *options);
 
        /* Device-specific */
        int (*dev_open) (int dev_index);
        int (*dev_close) (int dev_index);
+       /* TODO remove this */
        const void *(*dev_info_get) (int dev_index, int dev_info_id);
+       int (*info_get) (int dev_info_id, const void **data,
+                       const struct sr_dev_inst *sdi);
        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_config_set) (const struct sr_dev_inst *sdi, 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);
+
+       /* Dynamic */
+       GSList *instances;
 };
 
 struct sr_session {
@@ -487,6 +513,17 @@ struct sr_session {
        GSList *datafeed_callbacks;
        GTimeVal starttime;
        gboolean running;
+
+       unsigned int num_sources;
+
+       /* Both "sources" and "pollfds" are of the same size and contain pairs of
+        * descriptor and callback function. We can not embed the GPollFD into the
+        * source struct since we want to be able to pass the array of all poll
+        * descriptors to g_poll.
+        */
+       struct source *sources;
+       GPollFD *pollfds;
+       int source_timeout;
 };
 
 #include "proto.h"