move srd_Decoder to sigrokdecode.h, and rename it in line with srd_logic

[libsigrokdecode.git] / sigrokdecode.h

diff --git a/sigrokdecode.h b/sigrokdecode.h
index 3c693145c28b2363134393dd2edda5d73e4034b8..71d0ae478b69e2e2da8a0657e7a3d747fd86885c 100644 (file)
--- a/sigrokdecode.h
+++ b/sigrokdecode.h
@@ -138,15 +138,6 @@ struct srd_pd_output {
        char *proto_id;
 };
 
        char *proto_id;
 };
 

-typedef struct {
-       PyObject_HEAD
-       struct srd_decoder_instance *di;
-       unsigned int itercnt;
-       uint8_t *inbuf;
-       uint64_t inbuflen;
-       PyObject *sample;
-} srd_logic;
-

 struct srd_proto_data {
        uint64_t start_sample;
        uint64_t end_sample;
 struct srd_proto_data {
        uint64_t start_sample;
        uint64_t end_sample;


@@ -161,8 +152,22 @@ struct srd_pd_callback {
 };
 
 
 };
 
 

-/*--- controller.c ----------------------------------------------------------*/
+/* custom python types */
+typedef struct {
+       PyObject_HEAD
+} srd_Decoder;

 
 

+typedef struct {
+       PyObject_HEAD
+       struct srd_decoder_instance *di;
+       unsigned int itercnt;
+       uint8_t *inbuf;
+       uint64_t inbuflen;
+       PyObject *sample;
+} srd_logic;
+
+
+/*--- controller.c ----------------------------------------------------------*/

 int srd_init(void);
 int srd_exit(void);
 int set_modulepath(void);
 int srd_init(void);
 int srd_exit(void);
 int set_modulepath(void);