Revert FIRMWARE_DIR / DECODERS_DIR method for now.

[libsigrokdecode.git] / sigrokdecode.h

diff --git a/sigrokdecode.h b/sigrokdecode.h
index 4c30c34b7ffb9fd257538d06aecae5631b868ff0..c0de99f9c756e7821c982ef2d030cb43cb1d8be7 100644 (file)
--- a/sigrokdecode.h
+++ b/sigrokdecode.h
@@ -23,6 +23,11 @@
 
 #include <Python.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include <stdint.h>
+#include <glib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*
  * Status/error codes returned by libsigrokdecode functions.
@@ -41,15 +46,35 @@
  * or reused for different #defines later. You can only add new #defines and
  * return codes, but never remove or redefine existing ones.
  */
-#define SIGROKDECODE_OK                         0 /* No error */
-#define SIGROKDECODE_ERR               -1 /* Generic/unspecified error */
-#define SIGROKDECODE_ERR_MALLOC                -2 /* Malloc/calloc/realloc error */
-
-int sigrokdecode_init(void);
-int sigrokdecode_load_decoder_file(const char *name);
-int sigrokdecode_run_decoder(const char *modulename, const char *decodername,
-                            uint8_t *inbuf, uint64_t inbuflen,
-                            uint8_t **outbuf, uint64_t *outbuflen);
-int sigrokdecode_shutdown(void);
+#define SRD_OK                  0 /* No error */
+#define SRD_ERR                        -1 /* Generic/unspecified error */
+#define SRD_ERR_MALLOC         -2 /* Malloc/calloc/realloc error */
+#define SRD_ERR_ARGS           -3 /* Function argument error */
+#define SRD_ERR_PYTHON         -4 /* Python C API error */
+#define SRD_ERR_DECODERS_DIR   -5 /* Protocol decoder path invalid */
+
+/* TODO: Documentation. */
+struct srd_decoder {
+       char *id;
+       char *name;
+       char *desc;
+       char *func;
+       GSList *inputformats;
+       GSList *outputformats;
+
+       PyObject *py_mod;
+       PyObject *py_func;
+};
+
+int srd_init(void);
+GSList *srd_list_decoders(void);
+struct srd_decoder *srd_get_decoder_by_id(const char *id);
+int srd_run_decoder(struct srd_decoder *dec, uint8_t *inbuf, uint64_t inbuflen,
+                   uint8_t **outbuf, uint64_t *outbuflen);
+int srd_exit(void);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif