From 12243c22bf01506ac3b220bfe38384db9903756c Mon Sep 17 00:00:00 2001 From: Bert Vermeulen Date: Sun, 12 Feb 2012 14:18:32 +0100 Subject: srd: finish up public/private API --- controller.c | 8 +++++--- sigrokdecode-internal.h | 8 ++++++++ sigrokdecode.h | 7 ------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/controller.c b/controller.c index 0701674..2bc0a8c 100644 --- a/controller.c +++ b/controller.c @@ -332,6 +332,7 @@ static gint compare_probe_id(struct srd_probe *a, char *probe_id) * @param probes A GHashTable of probes to set. Key is probe name, value is * the probe number. Samples passed to this instance will be * arranged in this order. + * * @return SRD_OK upon success, a (negative) error code otherwise. */ SRD_API int srd_inst_set_probes(struct srd_decoder_inst *di, @@ -403,6 +404,7 @@ SRD_API int srd_inst_set_probes(struct srd_decoder_inst *di, * @param id Decoder 'id' field. * @param options GHashtable of options which override the defaults set in * the decoder class. + * * @return Pointer to a newly allocated struct srd_decoder_inst, or * NULL in case of failure. */ @@ -593,7 +595,7 @@ SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di, PyObject *args) * * @return SRD_OK upon success, a (negative) error code otherwise. */ -SRD_API int srd_inst_decode(uint64_t start_samplenum, +SRD_PRIV int srd_inst_decode(uint64_t start_samplenum, struct srd_decoder_inst *di, uint8_t *inbuf, uint64_t inbuflen) { @@ -645,7 +647,7 @@ SRD_API int srd_inst_decode(uint64_t start_samplenum, return SRD_OK; } -SRD_API void srd_inst_free(struct srd_decoder_inst *di) +SRD_PRIV void srd_inst_free(struct srd_decoder_inst *di) { GSList *l; struct srd_pd_output *pdo; @@ -664,7 +666,7 @@ SRD_API void srd_inst_free(struct srd_decoder_inst *di) g_slist_free(di->pd_output); } -SRD_API void srd_inst_free_all(GSList *stack) +SRD_PRIV void srd_inst_free_all(GSList *stack) { GSList *l; struct srd_decoder_inst *di; diff --git a/sigrokdecode-internal.h b/sigrokdecode-internal.h index 56d3691..a16154e 100644 --- a/sigrokdecode-internal.h +++ b/sigrokdecode-internal.h @@ -2,6 +2,7 @@ * This file is part of the sigrok project. * * Copyright (C) 2011 Uwe Hermann + * Copyright (C) 2012 Bert Vermeulen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -35,6 +36,13 @@ /*--- controller.c ----------------------------------------------------------*/ +SRD_PRIV int add_modulepath(const char *path); +SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di, PyObject *args); +SRD_PRIV int srd_inst_decode(uint64_t start_samplenum, + struct srd_decoder_inst *dec, + uint8_t *inbuf, uint64_t inbuflen); +SRD_PRIV void srd_inst_free(struct srd_decoder_inst *di); +SRD_PRIV void srd_inst_free_all(GSList *stack); SRD_PRIV int pd_add(struct srd_decoder_inst *di, int output_type, char *output_id); diff --git a/sigrokdecode.h b/sigrokdecode.h index 0558a4f..f66c244 100644 --- a/sigrokdecode.h +++ b/sigrokdecode.h @@ -201,7 +201,6 @@ typedef struct { SRD_API int srd_init(char *path); SRD_API int srd_exit(void); -SRD_PRIV int add_modulepath(const char *path); SRD_API int srd_inst_set_options(struct srd_decoder_inst *di, GHashTable *options); SRD_API int srd_inst_set_probes(struct srd_decoder_inst *di, @@ -211,12 +210,6 @@ SRD_API struct srd_decoder_inst *srd_inst_new(const char *id, SRD_API int srd_inst_stack(struct srd_decoder_inst *di_from, struct srd_decoder_inst *di_to); SRD_API struct srd_decoder_inst *srd_inst_find_by_id(char *inst_id); -SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di, PyObject *args); -SRD_API int srd_inst_decode(uint64_t start_samplenum, - struct srd_decoder_inst *dec, - uint8_t *inbuf, uint64_t inbuflen); -SRD_API void srd_inst_free(struct srd_decoder_inst *di); -SRD_API void srd_inst_free_all(GSList *stack); SRD_API int srd_session_start(int num_probes, int unitsize, uint64_t samplerate); SRD_API int srd_session_feed(uint64_t start_samplenum, uint8_t *inbuf, -- cgit v1.2.3-70-g09d2