fx2lafw: Added Saleae Logic (and clones) to the device list

[libsigrok.git] / sigrok-proto.h

diff --git a/sigrok-proto.h b/sigrok-proto.h
index 80d15ce955a393ac13ad72c4bd991f6d29a768e3..c357e389de864c3879119a48f2505a640d0967a4 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -27,13 +27,13 @@ SR_API int sr_exit(void);
 
 /*--- log.c -----------------------------------------------------------------*/
 
-typedef int (*sr_log_handler_t)(void *data, int loglevel, const char *format,
-                                va_list args);
+typedef int (*sr_log_callback_t)(void *cb_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_callback_set(sr_log_callback_t cb, void *cb_data);
+SR_API int sr_log_callback_set_default(void);
 SR_API int sr_log_logdomain_set(const char *logdomain);
 SR_API char *sr_log_logdomain_get(void);
 
@@ -54,8 +54,8 @@ SR_API struct sr_dev *sr_dev_new(const struct sr_dev_driver *driver,
 SR_API int sr_dev_probe_add(struct sr_dev *dev, const char *name);
 SR_API struct sr_probe *sr_dev_probe_find(const struct sr_dev *dev,
                                          int probenum);
-SR_API int sr_dev_probe_name(struct sr_dev *dev, int probenum,
-                            const char *name);
+SR_API int sr_dev_probe_name_set(struct sr_dev *dev, int probenum,
+                                const char *name);
 SR_API int sr_dev_trigger_clear(struct sr_dev *dev);
 SR_API int sr_dev_trigger_set(struct sr_dev *dev, int probenum,
                              const char *trigger);
@@ -71,15 +71,15 @@ SR_API int sr_filter_probes(int in_unitsize, int out_unitsize,
 
 /*--- hwdriver.c ------------------------------------------------------------*/
 
-SR_API struct sr_dev_driver **sr_hw_list(void);
-SR_API int sr_hw_init(struct sr_dev_driver *driver);
-SR_API gboolean sr_hw_has_hwcap(struct sr_dev_driver *driver, int hwcap);
+SR_API struct sr_dev_driver **sr_driver_list(void);
+SR_API int sr_driver_init(struct sr_dev_driver *driver);
+SR_API gboolean sr_driver_hwcap_exists(struct sr_dev_driver *driver, int hwcap);
 SR_API struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap);
 
 /*--- session.c -------------------------------------------------------------*/
 
-typedef void (*sr_datafeed_callback) (struct sr_dev *dev,
-                                     struct sr_datafeed_packet *packet);
+typedef void (*sr_datafeed_callback_t)(struct sr_dev *dev,
+                                      struct sr_datafeed_packet *packet);
 
 /* Session setup */
 SR_API int sr_session_load(const char *filename);
@@ -90,7 +90,7 @@ SR_API int sr_session_dev_add(struct sr_dev *dev);
 
 /* Datafeed setup */
 SR_API int sr_session_datafeed_callback_clear(void);
-SR_API int sr_session_datafeed_callback_add(sr_datafeed_callback callback);
+SR_API int sr_session_datafeed_callback_add(sr_datafeed_callback_t cb);
 
 /* Session control */
 SR_API int sr_session_start(void);
@@ -99,7 +99,7 @@ SR_API int sr_session_halt(void);
 SR_API int sr_session_stop(void);
 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);
+               sr_receive_data_callback_t cb, void *cb_data);
 SR_API int sr_session_source_remove(int fd);
 
 /*--- input/input.c ---------------------------------------------------------*/