#define LOG_PREFIX "input"
/** @endcond */
+/** @cond PRIVATE */
#define CHUNK_SIZE (4 * 1024 * 1024)
+/** @endcond */
/**
* @file
*/
/** @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,
};
*
* @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;
*/
SR_API int sr_input_send(const struct sr_input *in, GString *buf)
{
- sr_spew("Sending %" G_GSIZE_FORMAT " bytes to %s module.",
- buf->len, in->module->id);
+ size_t len;
+
+ len = buf ? buf->len : 0;
+ sr_spew("Sending %zu bytes to %s module.", len, in->module->id);
return in->module->receive((struct sr_input *)in, buf);
}