X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-proto.h;h=bb32fc7e15865010cda2456f47950afb370158ca;hb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;hp=3e91a3fa0a4d2fa39363bbdc2e34135ddfd2609a;hpb=0f8522bf74af8abfe8601e978b2e0d0e40b1a124;p=libsigrok.git diff --git a/sigrok-proto.h b/sigrok-proto.h index 3e91a3fa..bb32fc7e 100644 --- a/sigrok-proto.h +++ b/sigrok-proto.h @@ -1,7 +1,7 @@ /* * This file is part of the sigrok project. * - * Copyright (C) 2011 Bert Vermeulen + * Copyright (C) 2010-2012 Bert Vermeulen * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,8 +27,15 @@ SR_API int sr_exit(void); /*--- log.c -----------------------------------------------------------------*/ -SR_API int sr_set_loglevel(int loglevel); -SR_API int sr_get_loglevel(void); +typedef int (*sr_log_handler_t)(void *data, int loglevel, const char *format, + va_list args); + +SR_API int sr_log_loglevel_set(int loglevel); +SR_API int sr_log_loglevel_get(void); +SR_API int sr_log_handler_set(sr_log_handler_t handler, void *data); +SR_API int sr_log_handler_set_default(void); +SR_API int sr_log_logdomain_set(const char *logdomain); +SR_API char *sr_log_logdomain_get(void); /*--- datastore.c -----------------------------------------------------------*/ @@ -40,22 +47,20 @@ SR_API int sr_datastore_put(struct sr_datastore *ds, void *data, /*--- device.c --------------------------------------------------------------*/ -SR_API int sr_device_scan(void); -SR_API GSList *sr_device_list(void); -SR_API struct sr_device *sr_device_new(const struct sr_device_plugin *plugin, +SR_API int sr_dev_scan(void); +SR_API GSList *sr_dev_list(void); +SR_API struct sr_device *sr_dev_new(const struct sr_device_plugin *plugin, int plugin_index); -SR_API int sr_device_clear(struct sr_device *device); -SR_API int sr_device_probe_clear(struct sr_device *device, int probenum); -SR_API int sr_device_probe_add(struct sr_device *device, const char *name); -SR_API struct sr_probe *sr_device_probe_find(const struct sr_device *device, +SR_API int sr_dev_probe_add(struct sr_device *device, const char *name); +SR_API struct sr_probe *sr_dev_probe_find(const struct sr_device *device, int probenum); -SR_API int sr_device_probe_name(struct sr_device *device, int probenum, +SR_API int sr_dev_probe_name(struct sr_device *device, int probenum, const char *name); -SR_API int sr_device_trigger_clear(struct sr_device *device); -SR_API int sr_device_trigger_set(struct sr_device *device, int probenum, +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_device_has_hwcap(const struct sr_device *device, int hwcap); -SR_API int sr_device_get_info(const struct sr_device *device, int id, +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, const void **data); /*--- filter.c --------------------------------------------------------------*/ @@ -68,21 +73,9 @@ SR_API int sr_filter_probes(int in_unitsize, int out_unitsize, /*--- hwplugin.c ------------------------------------------------------------*/ SR_API GSList *sr_list_hwplugins(void); -SR_API int sr_init_hwplugins(struct sr_device_plugin *plugin); -SR_API void sr_cleanup_hwplugins(void); - -/* Generic device instances */ -SR_API struct sr_device_instance *sr_device_instance_new(int index, - int status, const char *vendor, const char *model, const char *version); -SR_API struct sr_device_instance *sr_get_device_instance( - GSList *device_instances, int device_index); -SR_API void sr_device_instance_free(struct sr_device_instance *sdi); - -SR_API int sr_find_hwcap(int *capabilities, int hwcap); +SR_API int sr_init_hwplugin(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 void sr_source_remove(int fd); -SR_API void sr_source_add(int fd, int events, int timeout, - sr_receive_data_callback rcv_cb, void *user_data); /*--- session.c -------------------------------------------------------------*/ @@ -105,8 +98,6 @@ SR_API int sr_session_start(void); SR_API int sr_session_run(void); SR_API int sr_session_halt(void); SR_API int sr_session_stop(void); -SR_API int sr_session_bus(struct sr_device *device, - struct sr_datafeed_packet *packet); SR_API int sr_session_save(const char *filename); SR_API int sr_session_source_add(int fd, int events, int timeout, sr_receive_data_callback callback, void *user_data); @@ -120,7 +111,7 @@ SR_API struct sr_input_format **sr_input_list(void); SR_API struct sr_output_format **sr_output_list(void); -/*--- output/common.c -------------------------------------------------------*/ +/*--- strutil.c -------------------------------------------------------*/ SR_API char *sr_samplerate_string(uint64_t samplerate); SR_API char *sr_period_string(uint64_t frequency);