X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok.h;h=306c20575900ea126f45254a23f7fa00e7df3a95;hb=15cb43d67cee5d7381c9cbcf0a355329a5cabfd1;hp=2ff6244ea0912670e9f16cb74091a599f4ba735e;hpb=47a98b6e2c241f225f78044f0237dc77d235ce6b;p=libsigrok.git diff --git a/libsigrok.h b/libsigrok.h index 2ff6244e..306c2057 100644 --- a/libsigrok.h +++ b/libsigrok.h @@ -251,6 +251,7 @@ struct sr_dev { enum { SR_PROBE_LOGIC, + SR_PROBE_ANALOG, }; struct sr_probe { @@ -435,9 +436,6 @@ 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. */ @@ -502,7 +500,7 @@ struct sr_dev_driver { void *cb_data); /* Dynamic */ - GSList *instances; + void *priv; }; struct sr_session { @@ -511,7 +509,6 @@ struct sr_session { /* list of sr_receive_data_callback_t */ GSList *datafeed_callbacks; GTimeVal starttime; - gboolean running; unsigned int num_sources;