srd: annotation -> annotations.

In the PDs (Python code), the 'annotation' variable/attribute is a list
of annotation formats. Use the plural 'annotations' as we do for other
lists such as 'inputs', 'outputs', 'probes', 'options', and so on.

diff --git a/decoder.c b/decoder.c
index d626bd39db3aae063a6f58502c0df1349fce7ced..e25e4e01599556e1db3e9b42d64969d47eece5d4 100644 (file)
--- a/decoder.c
+++ b/decoder.c
@@ -127,11 +127,11 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
        d->outputformats = NULL;
 
        /* Convert class annotation attribute to GSList of **char */
-       d->annotation = NULL;
-       if (PyObject_HasAttrString(py_res, "annotation")) {
-               py_annlist = PyObject_GetAttrString(py_res, "annotation");
+       d->annotations = NULL;
+       if (PyObject_HasAttrString(py_res, "annotations")) {
+               py_annlist = PyObject_GetAttrString(py_res, "annotations");
                if (!PyList_Check(py_annlist)) {
-                       srd_err("Protocol decoder module %s annotation should be a list", name);
+                       srd_err("Protocol decoder module %s annotations should be a list", name);
                        return SRD_ERR_PYTHON;
                }
                alen = PyList_Size(py_annlist);
@@ -145,7 +145,7 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
 
                        if (py_strlist_to_char(py_ann, &ann) != SRD_OK)
                                return SRD_ERR_PYTHON;
-                       d->annotation = g_slist_append(d->annotation, ann);
+                       d->annotations = g_slist_append(d->annotations, ann);
                }
        }
 

diff --git a/decoders/ddc.py b/decoders/ddc.py
index 58c74a4ad6c8a341546fa2b23d47621ceb6ec42b..b4681d0fbe0566cca9028bed096e7035bd0d086c 100644 (file)
--- a/decoders/ddc.py
+++ b/decoders/ddc.py
@@ -37,7 +37,7 @@ class Decoder(sigrokdecode.Decoder):
     license = 'gplv3+'
     inputs = ['i2c']
     outputs = ['ddc']
-    annotation = [
+    annotations = [
         ["Byte stream", "DDC byte stream as read from display."],
     ]
 

diff --git a/decoders/i2c.py b/decoders/i2c.py
index 60558c5a76eeb34e4b8a08c0ba14a5de997992f2..b101e8a2328fc2a191fd2a8188549b3faeadda72 100644 (file)
--- a/decoders/i2c.py
+++ b/decoders/i2c.py
@@ -137,7 +137,7 @@ class Decoder(sigrokdecode.Decoder):
     options = {
         'address-space': ['Address space (in bits)', 7],
     }
-    annotation = [
+    annotations = [
         # ANN_SHIFTED
         ["7-bit shifted hex",
          "Read/Write bit shifted out from the 8-bit i2c slave address"],

diff --git a/decoders/pan1321.py b/decoders/pan1321.py
index 3c093108b64dd3dbf8e77afe8aa49baee0b696ae..bebfc689c039ae259d44e67e467fc8abebe9b558 100644 (file)
--- a/decoders/pan1321.py
+++ b/decoders/pan1321.py
@@ -45,7 +45,7 @@ class Decoder(sigrokdecode.Decoder):
     # ]
     options = {
     }
-    annotation = [
+    annotations = [
         # ANN_ASCII
         ["ASCII", "TODO: description"],
     ]

diff --git a/decoders/uart.py b/decoders/uart.py
index 1c204dc053d7b9defccddb43b4883a232e2ad64d..c9f787583d7ee934610c13478f5f5451bf4d6b82 100644 (file)
--- a/decoders/uart.py
+++ b/decoders/uart.py
@@ -217,7 +217,7 @@ class Decoder(sigrokdecode.Decoder):
         # TODO: Options to invert the signal(s).
         # ...
     }
-    annotation = [
+    annotations = [
         # ANN_ASCII
         ["ASCII", "TODO: description"],
         # ANN_DEC

diff --git a/module_sigrokdecode.c b/module_sigrokdecode.c
index a3872ab53a260d92efa65fdff17e8cb25a44df69..d2ffb0767487576de20672710038baec76fa2b55 100644 (file)
--- a/module_sigrokdecode.c
+++ b/module_sigrokdecode.c
@@ -56,7 +56,7 @@ static int convert_pyobj(struct srd_decoder_instance *di, PyObject *obj,
        }
 
        ann_id = PyLong_AsLong(py_tmp);
-       if (!(pdo = g_slist_nth_data(di->decoder->annotation, ann_id))) {
+       if (!(pdo = g_slist_nth_data(di->decoder->annotations, ann_id))) {
                srd_err("Protocol decoder %s submitted data to non-existent annotation format %d",
                                di->decoder->name, ann_id);
                return SRD_ERR_PYTHON;

diff --git a/sigrokdecode.h b/sigrokdecode.h
index a4b5c2cd43b0a6b4aafec72a6a2748e518c94501..3c693145c28b2363134393dd2edda5d73e4034b8 100644 (file)
--- a/sigrokdecode.h
+++ b/sigrokdecode.h
@@ -111,7 +111,7 @@ struct srd_decoder {
        /* List of NULL-terminated char[], containing descriptions of the
         * supported annotation output.
         */
-       GSList *annotation;
+       GSList *annotations;
 
        /** TODO */
        PyObject *py_mod;