summaryrefslogtreecommitdiff
path: root/module_sigrokdecode.c
diff options
context:
space:
mode:
authorBert Vermeulen <bert@biot.com>2013-11-14 00:19:28 +0100
committerBert Vermeulen <bert@biot.com>2013-11-15 22:05:54 +0100
commit7ee0c40b4ac605c68a8ec2008ef4ab61a1872475 (patch)
treeab7dbaf517ff82ecae11b3d61c2b20a9705bf1ee /module_sigrokdecode.c
parent0b9224604aa166775a6693efba215a33ce594b70 (diff)
downloadlibsigrokdecode-7ee0c40b4ac605c68a8ec2008ef4ab61a1872475.tar.gz
libsigrokdecode-7ee0c40b4ac605c68a8ec2008ef4ab61a1872475.zip
Implement OUTPUT_META
This replaces the Decoder.add() method with Decoder.register(). The first argument is still output type, but all arguments are now optional: Decoder.register(output_type, id='someid', meta=(object-type, 'Name', 'Description')) 'id' defaults to the protocol decoder instance id, and only needs changing if a decoder chain needs to fork. 'object-type' refers to a Python object, such as int or str. After registering, the PD submits data as usual with Decoder.put(), with the only argument a value of the registered object-type.
Diffstat (limited to 'module_sigrokdecode.c')
-rw-r--r--module_sigrokdecode.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/module_sigrokdecode.c b/module_sigrokdecode.c
index 46b3ced..d5172d6 100644
--- a/module_sigrokdecode.c
+++ b/module_sigrokdecode.c
@@ -68,17 +68,17 @@ PyMODINIT_FUNC PyInit_sigrokdecode(void)
(PyObject *)&srd_logic_type) == -1)
return NULL;
- /* expose output types as symbols in the sigrokdecode module */
+ /* Expose output types as symbols in the sigrokdecode module */
if (PyModule_AddIntConstant(mod, "OUTPUT_ANN", SRD_OUTPUT_ANN) == -1)
return NULL;
- if (PyModule_AddIntConstant(mod, "OUTPUT_PYTHON",
- SRD_OUTPUT_PYTHON) == -1)
+ if (PyModule_AddIntConstant(mod, "OUTPUT_PYTHON", SRD_OUTPUT_PYTHON) == -1)
return NULL;
- if (PyModule_AddIntConstant(mod, "OUTPUT_BINARY",
- SRD_OUTPUT_BINARY) == -1)
+ if (PyModule_AddIntConstant(mod, "OUTPUT_BINARY", SRD_OUTPUT_BINARY) == -1)
return NULL;
- if (PyModule_AddIntConstant(mod, "SRD_CONF_SAMPLERATE",
- SRD_CONF_SAMPLERATE) == -1)
+ if (PyModule_AddIntConstant(mod, "OUTPUT_META", SRD_OUTPUT_META) == -1)
+ return NULL;
+ /* Expose meta input symbols. */
+ if (PyModule_AddIntConstant(mod, "SRD_CONF_SAMPLERATE", SRD_CONF_SAMPLERATE) == -1)
return NULL;
mod_sigrokdecode = mod;