X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok.h;h=d7d8c2fab317e283ed9337d395383942236672a2;hb=f50f3f40d9238b0c50be67e52bc132aadfcf2050;hp=a2d707ac7f3b9ab88bd5e21b99caa45f7529818c;hpb=e46b8fb154ba90ffec9c1f805399dfa819e736f9;p=libsigrok.git diff --git a/sigrok.h b/sigrok.h index a2d707ac..d7d8c2fa 100644 --- a/sigrok.h +++ b/sigrok.h @@ -129,35 +129,35 @@ struct analog_sample { struct analog_probe probes[]; }; -struct input { - struct input_format *format; +struct sr_input { + struct sr_input_format *format; char *param; struct device *vdevice; }; -struct input_format { +struct sr_input_format { char *extension; char *description; int (*format_match) (const char *filename); - int (*init) (struct input *in); - int (*loadfile) (struct input *in, const char *filename); + int (*init) (struct sr_input *in); + int (*loadfile) (struct sr_input *in, const char *filename); }; -struct output { - struct output_format *format; +struct sr_output { + struct sr_output_format *format; struct device *device; char *param; void *internal; }; -struct output_format { +struct sr_output_format { char *extension; char *description; int df_type; - int (*init) (struct output *o); - int (*data) (struct output *o, char *data_in, uint64_t length_in, + int (*init) (struct sr_output *o); + int (*data) (struct sr_output *o, char *data_in, uint64_t length_in, char **data_out, uint64_t *length_out); - int (*event) (struct output *o, int event_type, char **data_out, + int (*event) (struct sr_output *o, int event_type, char **data_out, uint64_t *length_out); };