X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-proto.h;h=f133b3cc63eda09b50e1250afca6e1b367bea74b;hb=93a04e3be9cdaa276d9e7fe14da053483b567b74;hp=fd6bcd0a8f5f8e98003767194e8df4fa035f9ef9;hpb=c532476aa7b9a4afb1f32d5b634348d3e825d6bb;p=libsigrok.git diff --git a/sigrok-proto.h b/sigrok-proto.h index fd6bcd0a..f133b3cc 100644 --- a/sigrok-proto.h +++ b/sigrok-proto.h @@ -60,7 +60,7 @@ SR_API int sr_dev_trigger_clear(struct sr_device *device); SR_API int sr_dev_trigger_set(struct sr_device *device, int probenum, const char *trigger); SR_API gboolean sr_dev_has_hwcap(const struct sr_device *device, int hwcap); -SR_API int sr_dev_get_info(const struct sr_device *device, int id, +SR_API int sr_dev_info_get(const struct sr_device *device, int id, const void **data); /*--- filter.c --------------------------------------------------------------*/ @@ -72,10 +72,10 @@ SR_API int sr_filter_probes(int in_unitsize, int out_unitsize, /*--- hwplugin.c ------------------------------------------------------------*/ -SR_API GSList *sr_hwplugins_list(void); -SR_API int sr_hwplugin_init(struct sr_device_plugin *plugin); -SR_API gboolean sr_has_hwcap(int *capabilities, int hwcap); -SR_API struct sr_hwcap_option *sr_find_hwcap_option(int hwcap); +SR_API GSList *sr_hw_list(void); +SR_API int sr_hw_init(struct sr_device_plugin *plugin); +SR_API gboolean sr_hw_has_hwcap(struct sr_device_plugin *plugin, int hwcap); +SR_API struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap); /*--- session.c -------------------------------------------------------------*/