X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok.h;h=641ca912bf7330e18eeb6326ccacd6e4aa871eaf;hb=f1a14ea7ab390e3d873631eaf0f0f915031b8e6f;hp=76b54b36007eead1049fc1711e40c5f79c95306c;hpb=9e41fdba4080de96fde23f00415056f51d79b469;p=libsigrok.git diff --git a/libsigrok.h b/libsigrok.h index 76b54b36..641ca912 100644 --- a/libsigrok.h +++ b/libsigrok.h @@ -436,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 */ @@ -487,9 +492,11 @@ struct sr_dev_driver { /* 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_acquisition_start) (int dev_index, void *session_dev_id); int (*dev_acquisition_stop) (int dev_index, void *session_dev_id);