* directory cannot be accessed, return SRD_ERR_DECODERS_DIR.
* If not enough memory could be allocated, return SRD_ERR_MALLOC.
*/
-SRD_API int srd_init(char *path)
+SRD_API int srd_init(const char *path)
{
int ret;
char *env_path;
{
srd_dbg("Exiting libsigrokdecode.");
- srd_decoders_unload_all();
+ srd_decoder_unload_all();
g_slist_free(pd_list);
+ pd_list = NULL;
/* Py_Finalize() returns void, any finalization errors are ignored. */
Py_Finalize();
wchar_t *wc_new_path;
char *item;
- srd_dbg("adding %s to module path", path);
+ srd_dbg("Adding '%s' to module path.", path);
new_path = g_string_sized_new(256);
g_string_assign(new_path, g_strdup(path));
}
/**
- * Set options in a decoder instance.
+ * Set one or more options in a decoder instance.
*
* Handled options are removed from the hash.
*
*
* @return SRD_OK upon success, a (negative) error code otherwise.
*/
-SRD_API int srd_inst_options_set(struct srd_decoder_inst *di,
- GHashTable *options)
+SRD_API int srd_inst_option_set(struct srd_decoder_inst *di,
+ GHashTable *options)
{
PyObject *py_dec_options, *py_dec_optkeys, *py_di_options, *py_optval;
PyObject *py_optlist, *py_classval;
return ret;
}
-/* Helper GComparefunc for g_slist_find_custom() in srd_inst_probes_set() */
-static gint compare_probe_id(struct srd_probe *a, char *probe_id)
+/* Helper GComparefunc for g_slist_find_custom() in srd_inst_probe_set_all() */
+static gint compare_probe_id(const struct srd_probe *a, const char *probe_id)
{
return strcmp(a->id, probe_id);
}
/**
- * Set probes in a decoder instance.
+ * Set all probes in a decoder instance.
+ *
+ * This function sets _all_ probes for the specified decoder instance, i.e.,
+ * it overwrites any probes that were already defined (if any).
*
* @param di Decoder instance.
* @param probes A GHashTable of probes to set. Key is probe name, value is
*
* @return SRD_OK upon success, a (negative) error code otherwise.
*/
-SRD_API int srd_inst_probes_set(struct srd_decoder_inst *di,
- GHashTable *new_probes)
+SRD_API int srd_inst_probe_set_all(struct srd_decoder_inst *di,
+ GHashTable *new_probes)
{
GList *l;
GSList *sl;
return NULL;
}
- if (srd_inst_options_set(di, options) != SRD_OK) {
+ if (srd_inst_option_set(di, options) != SRD_OK) {
g_free(di->dec_probemap);
g_free(di);
return NULL;
* @return SRD_OK upon success, a (negative) error code otherwise.
*/
SRD_API int srd_inst_stack(struct srd_decoder_inst *di_from,
- struct srd_decoder_inst *di_to)
+ struct srd_decoder_inst *di_to)
{
if (!di_from || !di_to) {
srd_err("Invalid from/to instance pair.");
*
* @return Pointer to struct srd_decoder_inst, or NULL if not found.
*/
-SRD_API struct srd_decoder_inst *srd_inst_find_by_id(char *inst_id)
+SRD_API struct srd_decoder_inst *srd_inst_find_by_id(const char *inst_id)
{
GSList *l;
struct srd_decoder_inst *tmp, *di;
*
* @return Pointer to struct srd_decoder_inst, or NULL if not found.
*/
-SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj(GSList *stack,
- PyObject *obj)
+SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj(const GSList *stack,
+ const PyObject *obj)
{
- GSList *l;
+// TODO?
+ const GSList *l;
struct srd_decoder_inst *tmp, *di;
di = NULL;
* @return SRD_OK upon success, a (negative) error code otherwise.
*/
SRD_PRIV int srd_inst_decode(uint64_t start_samplenum,
- struct srd_decoder_inst *di,
- uint8_t *inbuf, uint64_t inbuflen)
+ const struct srd_decoder_inst *di,
+ const uint8_t *inbuf, uint64_t inbuflen)
{
PyObject *py_res;
srd_logic *logic;
*/
logic = PyObject_New(srd_logic, &srd_logic_type);
Py_INCREF(logic);
- logic->di = di;
+ logic->di = (struct srd_decoder_inst *)di;
logic->start_samplenum = start_samplenum;
logic->itercnt = 0;
- logic->inbuf = inbuf;
+ logic->inbuf = (uint8_t *)inbuf;
logic->inbuflen = inbuflen;
logic->sample = PyList_New(2);
Py_INCREF(logic->sample);
}
/**
- * Feed a chunk of logic sample data to a running decoder session.
+ * Send a chunk of logic sample data to a running decoder session.
*
* @param start_samplenum The sample number of the first sample in this chunk.
* @param inbuf Pointer to sample data.
*
* @return SRD_OK upon success, a (negative) error code otherwise.
*/
-SRD_API int srd_session_feed(uint64_t start_samplenum, uint8_t *inbuf,
+SRD_API int srd_session_send(uint64_t start_samplenum, const uint8_t *inbuf,
uint64_t inbuflen)
{
GSList *d;
}
/**
- * Register a decoder output callback function.
+ * Register/add a decoder output callback function.
*
* The function will be called when a protocol decoder sends output back
* to the PD controller (except for Python objects, which only go up the
* @param cb The function to call. Must not be NULL.
* @param cb_data Private data for the callback function. Can be NULL.
*/
-SRD_API int srd_register_callback(int output_type,
- srd_pd_output_callback_t cb, void *cb_data)
+SRD_API int srd_pd_output_callback_add(int output_type,
+ srd_pd_output_callback_t cb, void *cb_data)
{
struct srd_pd_callback *pd_cb;
return SRD_OK;
}
-SRD_PRIV void *srd_find_callback(int output_type)
+SRD_PRIV void *srd_pd_output_callback_find(int output_type)
{
GSList *l;
struct srd_pd_callback *pd_cb;
/* This is the backend function to Python sigrokdecode.add() call. */
SRD_PRIV int pd_add(struct srd_decoder_inst *di, int output_type,
- char *proto_id)
+ const char *proto_id)
{
struct srd_pd_output *pdo;