X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Finput.c;h=3c7fd516a309ea7e05aff2da1b3c16a592355d6a;hb=HEAD;hp=282084cab008332593cab865a1e5ad987138a075;hpb=0da8e0bd2bf8496745ca4796c7f533dffc920f5f;p=libsigrok.git diff --git a/src/input/input.c b/src/input/input.c index 282084ca..cd0db1f1 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -29,7 +29,9 @@ #define LOG_PREFIX "input" /** @endcond */ +/** @cond PRIVATE */ #define CHUNK_SIZE (4 * 1024 * 1024) +/** @endcond */ /** * @file @@ -61,27 +63,35 @@ */ /** @cond PRIVATE */ +extern SR_PRIV struct sr_input_module input_binary; extern SR_PRIV struct sr_input_module input_chronovu_la8; extern SR_PRIV struct sr_input_module input_csv; -extern SR_PRIV struct sr_input_module input_binary; +extern SR_PRIV struct sr_input_module input_logicport; +extern SR_PRIV struct sr_input_module input_null; +extern SR_PRIV struct sr_input_module input_protocoldata; +extern SR_PRIV struct sr_input_module input_raw_analog; +extern SR_PRIV struct sr_input_module input_saleae; +extern SR_PRIV struct sr_input_module input_stf; extern SR_PRIV struct sr_input_module input_trace32_ad; extern SR_PRIV struct sr_input_module input_vcd; extern SR_PRIV struct sr_input_module input_wav; -extern SR_PRIV struct sr_input_module input_raw_analog; -extern SR_PRIV struct sr_input_module input_logicport; -extern SR_PRIV struct sr_input_module input_null; -/* @endcond */ +/** @endcond */ static const struct sr_input_module *input_module_list[] = { &input_binary, &input_chronovu_la8, &input_csv, + &input_logicport, + &input_null, + &input_protocoldata, + &input_raw_analog, + &input_saleae, +#if defined HAVE_INPUT_STF && HAVE_INPUT_STF + &input_stf, +#endif &input_trace32_ad, &input_vcd, &input_wav, - &input_raw_analog, - &input_logicport, - &input_null, NULL, }; @@ -165,7 +175,7 @@ SR_API const char *const *sr_input_extensions_get( * * @since 0.4.0 */ -SR_API const struct sr_input_module *sr_input_find(char *id) +SR_API const struct sr_input_module *sr_input_find(const char *id) { int i;