X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Finput.c;h=3c7fd516a309ea7e05aff2da1b3c16a592355d6a;hb=HEAD;hp=f7de6c7f36a821c16b54c88b4a573c8c427e6707;hpb=d891892dc05df8ce33fcadf4a123a83e17b5d620;p=libsigrok.git diff --git a/src/input/input.c b/src/input/input.c index f7de6c7f..cd0db1f1 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -63,29 +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_saleae; -extern SR_PRIV struct sr_input_module input_null; /** @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_saleae, - &input_null, NULL, }; @@ -169,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;