X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=proto.h;h=322dc2d2688ae7fc543487732cff35ba06f7d6a1;hb=refs%2Fheads%2Fdslogic;hp=d79e017be1cafa6fa67291da53038610ee6989cd;hpb=056be0719f0c1a05cde6fc2483b50e024708fdac;p=libsigrok.git diff --git a/proto.h b/proto.h index d79e017b..322dc2d2 100644 --- a/proto.h +++ b/proto.h @@ -1,7 +1,7 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * - * Copyright (C) 2010-2012 Bert Vermeulen + * Copyright (C) 2013 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 @@ -20,10 +20,16 @@ #ifndef LIBSIGROK_SIGROK_PROTO_H #define LIBSIGROK_SIGROK_PROTO_H +/** + * @file + * + * Header file containing API function prototypes. + */ + /*--- backend.c -------------------------------------------------------------*/ -SR_API int sr_init(void); -SR_API int sr_exit(void); +SR_API int sr_init(struct sr_context **ctx); +SR_API int sr_exit(struct sr_context *ctx); /*--- log.c -----------------------------------------------------------------*/ @@ -37,14 +43,6 @@ 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); -/*--- datastore.c -----------------------------------------------------------*/ - -SR_API int sr_datastore_new(int unitsize, struct sr_datastore **ds); -SR_API int sr_datastore_destroy(struct sr_datastore *ds); -SR_API int sr_datastore_put(struct sr_datastore *ds, void *data, - unsigned int length, int in_unitsize, - const int *probelist); - /*--- device.c --------------------------------------------------------------*/ SR_API int sr_dev_probe_name_set(const struct sr_dev_inst *sdi, @@ -53,30 +51,38 @@ SR_API int sr_dev_probe_enable(const struct sr_dev_inst *sdi, int probenum, gboolean state); SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum, const char *trigger); -SR_API gboolean sr_dev_has_hwcap(const struct sr_dev_inst *sdi, int hwcap); +SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key); +SR_API GSList *sr_dev_list(const struct sr_dev_driver *driver); +SR_API int sr_dev_clear(const struct sr_dev_driver *driver); +SR_API int sr_dev_open(struct sr_dev_inst *sdi); +SR_API int sr_dev_close(struct sr_dev_inst *sdi); /*--- filter.c --------------------------------------------------------------*/ -SR_API int sr_filter_probes(int in_unitsize, int out_unitsize, - const int *probelist, const uint8_t *data_in, +SR_API int sr_filter_probes(unsigned int in_unitsize, unsigned int out_unitsize, + const GArray *probe_array, const uint8_t *data_in, uint64_t length_in, uint8_t **data_out, uint64_t *length_out); /*--- hwdriver.c ------------------------------------------------------------*/ SR_API struct sr_dev_driver **sr_driver_list(void); -SR_API int sr_driver_init(struct sr_dev_driver *driver); +SR_API int sr_driver_init(struct sr_context *ctx, + struct sr_dev_driver *driver); SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options); -SR_API gboolean sr_driver_hwcap_exists(struct sr_dev_driver *driver, int hwcap); -SR_API const struct sr_hwcap_option *sr_drvopt_get(int hwopt); -SR_API const struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap); -SR_API int sr_info_get(struct sr_dev_driver *driver, int id, - const void **data, const struct sr_dev_inst *sdi); +SR_API int sr_config_get(const struct sr_dev_driver *driver, int key, + GVariant **data, const struct sr_dev_inst *sdi); +SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key, + GVariant *data); +SR_API int sr_config_list(const struct sr_dev_driver *driver, int key, + GVariant **data, const struct sr_dev_inst *sdi); +SR_API const struct sr_config_info *sr_config_info_get(int key); +SR_API const struct sr_config_info *sr_config_info_name_get(const char *optname); /*--- session.c -------------------------------------------------------------*/ typedef void (*sr_datafeed_callback_t)(const struct sr_dev_inst *sdi, - struct sr_datafeed_packet *packet); + const struct sr_datafeed_packet *packet, void *cb_data); /* Session setup */ SR_API int sr_session_load(const char *filename); @@ -87,21 +93,21 @@ SR_API int sr_session_dev_add(const struct sr_dev_inst *sdi); /* Datafeed setup */ SR_API int sr_session_datafeed_callback_remove_all(void); -SR_API int sr_session_datafeed_callback_add(sr_datafeed_callback_t cb); +SR_API int sr_session_datafeed_callback_add(sr_datafeed_callback_t cb, + void *cb_data); /* Session control */ 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_save(const char *filename, - const struct sr_dev_inst *sdi, struct sr_datastore *ds); +SR_API int sr_session_save(const char *filename, const struct sr_dev_inst *sdi, + unsigned char *buf, int unitsize, int units); SR_API int sr_session_source_add(int fd, int events, int timeout, - sr_receive_data_callback_t cb, void *cb_data); + sr_receive_data_callback_t cb, const struct sr_dev_inst *sdi); SR_API int sr_session_source_add_pollfd(GPollFD *pollfd, int timeout, - sr_receive_data_callback_t cb, void *cb_data); + sr_receive_data_callback_t cb, const struct sr_dev_inst *sdi); SR_API int sr_session_source_add_channel(GIOChannel *channel, int events, - int timeout, sr_receive_data_callback_t cb, void *cb_data); + int timeout, sr_receive_data_callback_t cb, const struct sr_dev_inst *sdi); SR_API int sr_session_source_remove(int fd); SR_API int sr_session_source_remove_pollfd(GPollFD *pollfd); SR_API int sr_session_source_remove_channel(GIOChannel *channel); @@ -116,16 +122,17 @@ SR_API struct sr_output_format **sr_output_list(void); /*--- strutil.c -------------------------------------------------------------*/ +SR_API char *sr_si_string_u64(uint64_t x, const char *unit); SR_API char *sr_samplerate_string(uint64_t samplerate); SR_API char *sr_period_string(uint64_t frequency); -SR_API char *sr_voltage_string(struct sr_rational *voltage); +SR_API char *sr_voltage_string(uint64_t v_p, uint64_t v_q); SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi, const char *triggerstring); SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size); SR_API uint64_t sr_parse_timestring(const char *timestring); SR_API gboolean sr_parse_boolstring(const char *boolstring); -SR_API int sr_parse_period(const char *periodstr, struct sr_rational *r); -SR_API int sr_parse_voltage(const char *voltstr, struct sr_rational *r); +SR_API int sr_parse_period(const char *periodstr, uint64_t *p, uint64_t *q); +SR_API int sr_parse_voltage(const char *voltstr, uint64_t *p, uint64_t *q); /*--- version.c -------------------------------------------------------------*/ @@ -144,4 +151,29 @@ SR_API const char *sr_lib_version_string_get(void); SR_API const char *sr_strerror(int error_code); SR_API const char *sr_strerror_name(int error_code); +/*--- libusbhp.c ------------------------------------------------------------*/ +SR_API int libusbhp_init(struct libusbhp_t **handle); + +SR_API void libusbhp_exit(struct libusbhp_t *handle); + +SR_API int libusbhp_handle_events_timeout(struct libusbhp_t *handle, struct timeval *tv); + +SR_API void libusbhp_register_hotplug_listeners(struct libusbhp_t *handle, + libusbhp_hotplug_cb_fn connected_cb, + libusbhp_hotplug_cb_fn disconnected_cb, + void *user_data); + +/*--- trigger.c ------------------------------------------------------------*/ +SR_API int ds_trigger_init(void); +SR_API int ds_trigger_destroy(void); +SR_API int ds_trigger_stage_set_value(uint16_t stage, uint16_t probes, char *trigger0, char *trigger1); +SR_API int ds_trigger_stage_set_logic(uint16_t stage, uint16_t probes, unsigned char trigger_logic); +SR_API int ds_trigger_stage_set_inv(uint16_t stage, uint16_t probes, unsigned char trigger0_inv, unsigned char trigger1_inv); +SR_API int ds_trigger_stage_set_count(uint16_t stage, uint16_t probes, uint16_t trigger0_count, uint16_t trigger1_count); +SR_API int ds_trigger_probe_set(uint16_t probe, unsigned char trigger0, unsigned char trigger1); +SR_API int ds_trigger_set_stage(uint16_t stages); +SR_API int ds_trigger_set_pos(uint16_t position); +SR_API int ds_trigger_set_en(uint16_t enable); +SR_API int ds_trigger_set_mode(uint16_t mode); + #endif