X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-proto.h;h=2c3be8b12f55184ff6af9cac4579d8e177182128;hb=488a13b110d3563194dd63e087e295a4aa114002;hp=fce35c094b249675a849a7ef5f5bb7ce664cd724;hpb=1352eeddd4d164b58f2233ae109432b73faab539;p=libsigrok.git diff --git a/sigrok-proto.h b/sigrok-proto.h index fce35c09..2c3be8b1 100644 --- a/sigrok-proto.h +++ b/sigrok-proto.h @@ -40,8 +40,7 @@ void sr_datastore_put(struct sr_datastore *ds, void *data, unsigned int length, /*--- device.c --------------------------------------------------------------*/ void sr_device_scan(void); -int sr_device_plugin_init(struct sr_device_plugin *plugin); -void sr_device_close_all(void); +int sr_init_hwplugins(struct sr_device_plugin *plugin); GSList *sr_device_list(void); struct sr_device *sr_device_new(struct sr_device_plugin *plugin, int plugin_index, int num_probes); @@ -61,13 +60,14 @@ gboolean sr_device_has_hwcap(struct sr_device *device, int hwcap); /*--- filter.c --------------------------------------------------------------*/ -int sr_filter_probes(int in_unitsize, int out_unitsize, int *probelist, - const char *data_in, uint64_t length_in, char **data_out, - uint64_t *length_out); +int sr_filter_probes(int in_unitsize, int out_unitsize, const int *probelist, + const unsigned char *data_in, uint64_t length_in, + char **data_out, uint64_t *length_out); /*--- hwplugin.c ------------------------------------------------------------*/ GSList *sr_list_hwplugins(void); +void sr_cleanup_hwplugins(void); /* Generic device instances */ struct sr_device_instance *sr_device_instance_new(int index, @@ -142,7 +142,8 @@ char *sr_samplerate_string(uint64_t samplerate); char *sr_period_string(uint64_t frequency); char **sr_parse_triggerstring(struct sr_device *device, const char *triggerstring); -uint64_t sr_parse_sizestring(const char *sizestring); +int sr_parse_sizestring(const char *sizestring, uint64_t *size); uint64_t sr_parse_timestring(const char *timestring); +gboolean sr_parse_boolstring(const char *boolstring); #endif