srd: finish up public/private API

diff --git a/controller.c b/controller.c
index 07016740a9cab4afe054ebe8272c1b352c78c7cf..2bc0a8c61866822e01253d5148fd419e5871c79a 100644 (file)
--- 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.
  * @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,
  * @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.
  * @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.
  */
  * @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.
  */
  *
  * @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)
 {
                                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;
 }
 
        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;
 {
        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);
 }
 
        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;
 {
        GSList *l;
        struct srd_decoder_inst *di;

diff --git a/sigrokdecode-internal.h b/sigrokdecode-internal.h
index 56d36917f7da5c2dca55e28a93e37259e5daf1a2..a16154e55f703fb988e496ef5704376f9dd1a474 100644 (file)
--- 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 <uwe@hermann-uwe.de>
  * This file is part of the sigrok project.
  *
  * Copyright (C) 2011 Uwe Hermann <uwe@hermann-uwe.de>

+ * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>

  *
  * 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
  *
  * 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 ----------------------------------------------------------*/
 
 
 /*--- 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);
 
 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 0558a4f51fd63776dc472a6ee5dab4797bec1c9f..f66c244cf9ab046561f2f8d9af942d2b93780176 100644 (file)
--- 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_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,
 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_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,
 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,