/*--- 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);
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);
/*--- 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);
/* 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);
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 ---------------------------------------------------------*/