in/out: Minor consistency renames.

[libsigrok.git] / include / libsigrok / proto.h

diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h
index 7ff6a1507205a76e800e2b5817b5605d6fd41103..e74f39923e32e404e442ac6a3d39a89e8f6e20a3 100644 (file)
--- a/include/libsigrok/proto.h
+++ b/include/libsigrok/proto.h
@@ -26,6 +26,15 @@
  * Header file containing API function prototypes.
  */
 
+/*--- analog.c --------------------------------------------------------------*/
+
+SR_API int sr_analog_to_float(const struct sr_datafeed_analog2 *analog,
+               float *buf);
+SR_API int sr_analog_float_to_string(float value, int digits, char **result);
+SR_API int sr_analog_unit_to_string(const struct sr_datafeed_analog2 *analog,
+               char **result);
+SR_API inline void sr_rational_set(struct sr_rational *r, uint64_t p, uint64_t q);
+
 /*--- backend.c -------------------------------------------------------------*/
 
 SR_API int sr_init(struct sr_context **ctx);
@@ -55,14 +64,18 @@ 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);
 
-SR_API struct sr_dev_driver *sr_dev_inst_driver_get(struct sr_dev_inst *sdi);
-SR_API const char *sr_dev_inst_vendor_get(struct sr_dev_inst *sdi);
-SR_API const char *sr_dev_inst_model_get(struct sr_dev_inst *sdi);
-SR_API const char *sr_dev_inst_version_get(struct sr_dev_inst *sdi);
-SR_API const char *sr_dev_inst_sernum_get(struct sr_dev_inst *sdi);
-SR_API const char *sr_dev_inst_connid_get(struct sr_dev_inst *sdi);
-SR_API GSList *sr_dev_inst_channels_get(struct sr_dev_inst *sdi);
-SR_API GSList *sr_dev_inst_channel_groups_get(struct sr_dev_inst *sdi);
+SR_API struct sr_dev_driver *sr_dev_inst_driver_get(const struct sr_dev_inst *sdi);
+SR_API const char *sr_dev_inst_vendor_get(const struct sr_dev_inst *sdi);
+SR_API const char *sr_dev_inst_model_get(const struct sr_dev_inst *sdi);
+SR_API const char *sr_dev_inst_version_get(const struct sr_dev_inst *sdi);
+SR_API const char *sr_dev_inst_sernum_get(const struct sr_dev_inst *sdi);
+SR_API const char *sr_dev_inst_connid_get(const struct sr_dev_inst *sdi);
+SR_API GSList *sr_dev_inst_channels_get(const struct sr_dev_inst *sdi);
+SR_API GSList *sr_dev_inst_channel_groups_get(const struct sr_dev_inst *sdi);
+
+SR_API struct sr_dev_inst *sr_dev_inst_user_new(const char *vendor,
+               const char *model, const char *version);
+SR_API int sr_dev_inst_channel_add(struct sr_dev_inst *sdi, int index, int type, const char *name);
 
 /*--- hwdriver.c ------------------------------------------------------------*/
 
@@ -134,11 +147,13 @@ SR_API int sr_session_source_remove_channel(struct sr_session *session,
 /*--- input/input.c ---------------------------------------------------------*/
 
 SR_API const struct sr_input_module **sr_input_list(void);
-SR_API const char *sr_input_id_get(const struct sr_input_module *in);
-SR_API const char *sr_input_name_get(const struct sr_input_module *in);
-SR_API const char *sr_input_description_get(const struct sr_input_module *in);
+SR_API const char *sr_input_id_get(const struct sr_input_module *imod);
+SR_API const char *sr_input_name_get(const struct sr_input_module *imod);
+SR_API const char *sr_input_description_get(const struct sr_input_module *imod);
+SR_API const char *const *sr_input_extensions_get(
+               const struct sr_input_module *imod);
 SR_API const struct sr_input_module *sr_input_find(char *id);
-SR_API const struct sr_option **sr_input_options_get(const struct sr_input_module *in);
+SR_API const struct sr_option **sr_input_options_get(const struct sr_input_module *imod);
 SR_API void sr_input_options_free(const struct sr_option **options);
 SR_API struct sr_input *sr_input_new(const struct sr_input_module *imod,
                GHashTable *options);
@@ -152,13 +167,15 @@ SR_API void sr_input_free(const struct sr_input *in);
 /*--- output/output.c -------------------------------------------------------*/
 
 SR_API const struct sr_output_module **sr_output_list(void);
-SR_API const char *sr_output_id_get(const struct sr_output_module *o);
-SR_API const char *sr_output_name_get(const struct sr_output_module *o);
-SR_API const char *sr_output_description_get(const struct sr_output_module *o);
+SR_API const char *sr_output_id_get(const struct sr_output_module *omod);
+SR_API const char *sr_output_name_get(const struct sr_output_module *omod);
+SR_API const char *sr_output_description_get(const struct sr_output_module *omod);
+SR_API const char *const *sr_output_extensions_get(
+               const struct sr_output_module *omod);
 SR_API const struct sr_output_module *sr_output_find(char *id);
-SR_API const struct sr_option **sr_output_options_get(const struct sr_output_module *o);
+SR_API const struct sr_option **sr_output_options_get(const struct sr_output_module *omod);
 SR_API void sr_output_options_free(const struct sr_option **opts);
-SR_API const struct sr_output *sr_output_new(const struct sr_output_module *o,
+SR_API const struct sr_output *sr_output_new(const struct sr_output_module *omod,
                GHashTable *params, const struct sr_dev_inst *sdi);
 SR_API int sr_output_send(const struct sr_output *o,
                const struct sr_datafeed_packet *packet, GString **out);
@@ -172,6 +189,11 @@ SR_API struct sr_trigger_stage *sr_trigger_stage_add(struct sr_trigger *trig);
 SR_API int sr_trigger_match_add(struct sr_trigger_stage *stage,
                struct sr_channel *ch, int trigger_match, float value);
 
+/*--- serial.c --------------------------------------------------------------*/
+
+SR_API GSList *sr_serial_list(const struct sr_dev_driver *driver);
+SR_API void sr_serial_free(struct sr_serial_port *serial);
+
 /*--- strutil.c -------------------------------------------------------------*/
 
 SR_API char *sr_si_string_u64(uint64_t x, const char *unit);