Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 1 | /* |
| 2 | * This file is part of the sigrok project. |
| 3 | * |
| 4 | * Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de> |
Bert Vermeulen | bc5f5a4 | 2012-01-05 03:31:36 +0100 | [diff] [blame] | 5 | * Copyright (C) 2012 Bert Vermeulen <bert@biot.com> |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 6 | * |
| 7 | * This program is free software: you can redistribute it and/or modify |
| 8 | * it under the terms of the GNU General Public License as published by |
| 9 | * the Free Software Foundation, either version 3 of the License, or |
| 10 | * (at your option) any later version. |
| 11 | * |
| 12 | * This program is distributed in the hope that it will be useful, |
| 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 15 | * GNU General Public License for more details. |
| 16 | * |
| 17 | * You should have received a copy of the GNU General Public License |
| 18 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 19 | */ |
| 20 | |
Uwe Hermann | 7319141 | 2012-01-03 19:56:01 +0100 | [diff] [blame] | 21 | #include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 22 | #include "sigrokdecode-internal.h" |
| 23 | #include "config.h" |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 24 | #include <glib.h> |
Bert Vermeulen | 1aef2f9 | 2011-12-15 03:31:31 +0100 | [diff] [blame] | 25 | #include <inttypes.h> |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 26 | #include <stdlib.h> |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 27 | |
Bert Vermeulen | d906d3f | 2012-01-22 02:51:49 +0100 | [diff] [blame] | 28 | /* List of decoder instances. */ |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 29 | static GSList *di_list = NULL; |
Bert Vermeulen | d906d3f | 2012-01-22 02:51:49 +0100 | [diff] [blame] | 30 | |
| 31 | /* List of frontend callbacks to receive PD output. */ |
Bert Vermeulen | 983cb0f | 2012-01-08 03:20:12 +0100 | [diff] [blame] | 32 | static GSList *callbacks = NULL; |
| 33 | |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 34 | /* decoder.c */ |
Uwe Hermann | 55c3c5f | 2012-02-09 19:11:53 +0100 | [diff] [blame] | 35 | extern SRD_PRIV GSList *pd_list; |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 36 | |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 37 | /* module_sigrokdecode.c */ |
Uwe Hermann | 55c3c5f | 2012-02-09 19:11:53 +0100 | [diff] [blame] | 38 | extern SRD_PRIV PyMODINIT_FUNC PyInit_sigrokdecode(void); |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 39 | |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 40 | /* type_logic.c */ |
Uwe Hermann | 55c3c5f | 2012-02-09 19:11:53 +0100 | [diff] [blame] | 41 | extern SRD_PRIV PyTypeObject srd_logic_type; |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 42 | |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 43 | /** |
| 44 | * Initialize libsigrokdecode. |
| 45 | * |
| 46 | * This initializes the Python interpreter, and creates and initializes |
| 47 | * a "sigrok" Python module with a single put() method. |
| 48 | * |
| 49 | * Then, it searches for sigrok protocol decoder files (*.py) in the |
| 50 | * "decoders" subdirectory of the the sigrok installation directory. |
| 51 | * All decoders that are found are loaded into memory and added to an |
| 52 | * internal list of decoders, which can be queried via srd_list_decoders(). |
| 53 | * |
| 54 | * The caller is responsible for calling the clean-up function srd_exit(), |
| 55 | * which will properly shut down libsigrokdecode and free its allocated memory. |
| 56 | * |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 57 | * Multiple calls to srd_init(), without calling srd_exit() in between, |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 58 | * are not allowed. |
| 59 | * |
Bert Vermeulen | 65e1c7d | 2012-02-12 04:07:22 +0100 | [diff] [blame] | 60 | * @param path Path to an extra directory containing protocol decoders |
| 61 | * which will be added to the python sys.path, or NULL. |
| 62 | * |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 63 | * @return SRD_OK upon success, a (negative) error code otherwise. |
| 64 | * Upon Python errors, return SRD_ERR_PYTHON. If the sigrok decoders |
| 65 | * directory cannot be accessed, return SRD_ERR_DECODERS_DIR. |
| 66 | * If not enough memory could be allocated, return SRD_ERR_MALLOC. |
| 67 | */ |
Bert Vermeulen | 65e1c7d | 2012-02-12 04:07:22 +0100 | [diff] [blame] | 68 | SRD_API int srd_init(char *path) |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 69 | { |
| 70 | int ret; |
Bert Vermeulen | 65e1c7d | 2012-02-12 04:07:22 +0100 | [diff] [blame] | 71 | char *env_path; |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 72 | |
Uwe Hermann | 7a1712c | 2012-01-26 01:15:10 +0100 | [diff] [blame] | 73 | srd_dbg("Initializing libsigrokdecode."); |
Bert Vermeulen | d906d3f | 2012-01-22 02:51:49 +0100 | [diff] [blame] | 74 | |
| 75 | /* Add our own module to the list of built-in modules. */ |
Bert Vermeulen | bc5f5a4 | 2012-01-05 03:31:36 +0100 | [diff] [blame] | 76 | PyImport_AppendInittab("sigrokdecode", PyInit_sigrokdecode); |
Bert Vermeulen | 5f802ec | 2011-12-27 22:15:53 +0100 | [diff] [blame] | 77 | |
Uwe Hermann | 511e212 | 2012-02-10 09:29:38 +0100 | [diff] [blame] | 78 | /* Initialize the Python interpreter. */ |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 79 | Py_Initialize(); |
| 80 | |
Bert Vermeulen | 65e1c7d | 2012-02-12 04:07:22 +0100 | [diff] [blame] | 81 | /* Installed decoders. */ |
| 82 | if ((ret = add_modulepath(DECODERS_DIR)) != SRD_OK) { |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 83 | Py_Finalize(); |
| 84 | return ret; |
| 85 | } |
| 86 | |
Bert Vermeulen | 65e1c7d | 2012-02-12 04:07:22 +0100 | [diff] [blame] | 87 | /* Path specified by the user. */ |
| 88 | if (path) { |
| 89 | if ((ret = add_modulepath(path)) != SRD_OK) { |
| 90 | Py_Finalize(); |
| 91 | return ret; |
| 92 | } |
| 93 | } |
| 94 | |
| 95 | /* Environment variable overrides everything, for debugging. */ |
| 96 | if ((env_path = getenv("SIGROKDECODE_DIR"))) { |
| 97 | if ((ret = add_modulepath(path)) != SRD_OK) { |
| 98 | Py_Finalize(); |
| 99 | return ret; |
| 100 | } |
| 101 | } |
| 102 | |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 103 | if ((ret = srd_load_all_decoders()) != SRD_OK) { |
| 104 | Py_Finalize(); |
| 105 | return ret; |
| 106 | } |
| 107 | |
| 108 | return SRD_OK; |
| 109 | } |
| 110 | |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 111 | /** |
| 112 | * Shutdown libsigrokdecode. |
| 113 | * |
| 114 | * This frees all the memory allocated for protocol decoders and shuts down |
| 115 | * the Python interpreter. |
| 116 | * |
| 117 | * This function should only be called if there was a (successful!) invocation |
| 118 | * of srd_init() before. Calling this function multiple times in a row, without |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 119 | * any successful srd_init() calls in between, is not allowed. |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 120 | * |
| 121 | * @return SRD_OK upon success, a (negative) error code otherwise. |
| 122 | */ |
Uwe Hermann | 55c3c5f | 2012-02-09 19:11:53 +0100 | [diff] [blame] | 123 | SRD_API int srd_exit(void) |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 124 | { |
Uwe Hermann | 7a1712c | 2012-01-26 01:15:10 +0100 | [diff] [blame] | 125 | srd_dbg("Exiting libsigrokdecode."); |
Bert Vermeulen | d906d3f | 2012-01-22 02:51:49 +0100 | [diff] [blame] | 126 | |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 127 | srd_unload_all_decoders(); |
Bert Vermeulen | e508088 | 2011-12-07 09:56:49 +0100 | [diff] [blame] | 128 | g_slist_free(pd_list); |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 129 | |
| 130 | /* Py_Finalize() returns void, any finalization errors are ignored. */ |
| 131 | Py_Finalize(); |
| 132 | |
| 133 | return SRD_OK; |
| 134 | } |
| 135 | |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 136 | /** |
Uwe Hermann | 9d9fcb3 | 2012-01-23 19:58:06 +0100 | [diff] [blame] | 137 | * Add an additional search directory for the protocol decoders. |
| 138 | * |
| 139 | * The specified directory is prepended (not appended!) to Python's sys.path, |
| 140 | * in order to search for sigrok protocol decoders in the specified |
| 141 | * directories first, and in the generic Python module directories (and in |
| 142 | * the current working directory) last. This avoids conflicts if there are |
| 143 | * Python modules which have the same name as a sigrok protocol decoder in |
| 144 | * sys.path or in the current working directory. |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 145 | * |
Bert Vermeulen | 65e1c7d | 2012-02-12 04:07:22 +0100 | [diff] [blame] | 146 | * @param path Path to an extra directory containing protocol decoders |
| 147 | * which will be added to the python sys.path, or NULL. |
Uwe Hermann | 9d9fcb3 | 2012-01-23 19:58:06 +0100 | [diff] [blame] | 148 | * |
Bert Vermeulen | 65e1c7d | 2012-02-12 04:07:22 +0100 | [diff] [blame] | 149 | * @return SRD_OK upon success, a (negative) error code otherwise. |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 150 | */ |
Bert Vermeulen | 65e1c7d | 2012-02-12 04:07:22 +0100 | [diff] [blame] | 151 | SRD_PRIV int add_modulepath(const char *path) |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 152 | { |
Bert Vermeulen | 65e1c7d | 2012-02-12 04:07:22 +0100 | [diff] [blame] | 153 | PyObject *py_cur_path, *py_item; |
| 154 | GString *new_path; |
| 155 | int wc_len, i; |
| 156 | wchar_t *wc_new_path; |
| 157 | char *item; |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 158 | |
Bert Vermeulen | 65e1c7d | 2012-02-12 04:07:22 +0100 | [diff] [blame] | 159 | srd_dbg("adding %s to module path", path); |
Uwe Hermann | 639c568 | 2012-01-19 00:21:00 +0100 | [diff] [blame] | 160 | |
Bert Vermeulen | 65e1c7d | 2012-02-12 04:07:22 +0100 | [diff] [blame] | 161 | new_path = g_string_sized_new(256); |
| 162 | g_string_assign(new_path, g_strdup(path)); |
| 163 | py_cur_path = PySys_GetObject("path"); |
| 164 | for (i = 0; i < PyList_Size(py_cur_path); i++) { |
| 165 | g_string_append(new_path, g_strdup(G_SEARCHPATH_SEPARATOR_S)); |
| 166 | py_item = PyList_GetItem(py_cur_path, i); |
| 167 | if (!PyUnicode_Check(py_item)) |
| 168 | /* Shouldn't happen. */ |
| 169 | continue; |
| 170 | if (py_str_as_str(py_item, &item) != SRD_OK) |
| 171 | continue; |
| 172 | g_string_append(new_path, item); |
| 173 | } |
Uwe Hermann | 639c568 | 2012-01-19 00:21:00 +0100 | [diff] [blame] | 174 | |
Bert Vermeulen | 65e1c7d | 2012-02-12 04:07:22 +0100 | [diff] [blame] | 175 | /* Convert to wide chars. */ |
| 176 | wc_len = sizeof(wchar_t) * (new_path->len + 1); |
| 177 | if (!(wc_new_path = g_try_malloc(wc_len))) { |
| 178 | srd_dbg("malloc failed"); |
| 179 | return SRD_ERR_MALLOC; |
| 180 | } |
| 181 | mbstowcs(wc_new_path, new_path->str, wc_len); |
| 182 | PySys_SetPath(wc_new_path); |
| 183 | g_string_free(new_path, TRUE); |
| 184 | g_free(wc_new_path); |
Uwe Hermann | 639c568 | 2012-01-19 00:21:00 +0100 | [diff] [blame] | 185 | |
Bert Vermeulen | 65e1c7d | 2012-02-12 04:07:22 +0100 | [diff] [blame] | 186 | //#ifdef _WIN32 |
| 187 | // gchar **splitted; |
| 188 | // |
| 189 | // /* |
| 190 | // * On Windows/MinGW, Python's sys.path needs entries of the form |
| 191 | // * 'C:\\foo\\bar' instead of '/foo/bar'. |
| 192 | // */ |
| 193 | // |
| 194 | // splitted = g_strsplit(DECODERS_DIR, "/", 0); |
| 195 | // path = g_build_pathv("\\\\", splitted); |
| 196 | // g_strfreev(splitted); |
| 197 | //#else |
| 198 | // path = g_strdup(DECODERS_DIR); |
| 199 | //#endif |
Uwe Hermann | 639c568 | 2012-01-19 00:21:00 +0100 | [diff] [blame] | 200 | |
Bert Vermeulen | 65e1c7d | 2012-02-12 04:07:22 +0100 | [diff] [blame] | 201 | return SRD_OK; |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 202 | } |
| 203 | |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 204 | /** |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 205 | * Set options in a decoder instance. |
| 206 | * |
| 207 | * @param di Decoder instance. |
| 208 | * @param options A GHashTable of options to set. |
| 209 | * |
| 210 | * Handled options are removed from the hash. |
| 211 | * |
| 212 | * @return SRD_OK upon success, a (negative) error code otherwise. |
| 213 | */ |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 214 | SRD_API int srd_inst_set_options(struct srd_decoder_inst *di, |
Uwe Hermann | 55c3c5f | 2012-02-09 19:11:53 +0100 | [diff] [blame] | 215 | GHashTable *options) |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 216 | { |
| 217 | PyObject *py_dec_options, *py_dec_optkeys, *py_di_options, *py_optval; |
| 218 | PyObject *py_optlist, *py_classval; |
| 219 | Py_UNICODE *py_ustr; |
| 220 | unsigned long long int val_ull; |
| 221 | int num_optkeys, ret, size, i; |
| 222 | char *key, *value; |
| 223 | |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 224 | if (!PyObject_HasAttrString(di->decoder->py_dec, "options")) { |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 225 | /* Decoder has no options. */ |
Bert Vermeulen | e431d9c | 2012-01-18 22:59:14 +0100 | [diff] [blame] | 226 | if (g_hash_table_size(options) == 0) { |
| 227 | /* No options provided. */ |
| 228 | return SRD_OK; |
| 229 | } else { |
| 230 | srd_err("Protocol decoder has no options."); |
| 231 | return SRD_ERR_ARG; |
| 232 | } |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 233 | return SRD_OK; |
Bert Vermeulen | e431d9c | 2012-01-18 22:59:14 +0100 | [diff] [blame] | 234 | } |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 235 | |
| 236 | ret = SRD_ERR_PYTHON; |
| 237 | key = NULL; |
| 238 | py_dec_options = py_dec_optkeys = py_di_options = py_optval = NULL; |
| 239 | py_optlist = py_classval = NULL; |
| 240 | py_dec_options = PyObject_GetAttrString(di->decoder->py_dec, "options"); |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 241 | |
| 242 | /* All of these are synthesized objects, so they're good. */ |
| 243 | py_dec_optkeys = PyDict_Keys(py_dec_options); |
| 244 | num_optkeys = PyList_Size(py_dec_optkeys); |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 245 | if (!(py_di_options = PyObject_GetAttrString(di->py_inst, "options"))) |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 246 | goto err_out; |
| 247 | for (i = 0; i < num_optkeys; i++) { |
| 248 | /* Get the default class value for this option. */ |
| 249 | py_str_as_str(PyList_GetItem(py_dec_optkeys, i), &key); |
| 250 | if (!(py_optlist = PyDict_GetItemString(py_dec_options, key))) |
| 251 | goto err_out; |
| 252 | if (!(py_classval = PyList_GetItem(py_optlist, 1))) |
| 253 | goto err_out; |
Bert Vermeulen | 130ef08 | 2012-01-19 00:00:02 +0100 | [diff] [blame] | 254 | if (!PyUnicode_Check(py_classval) && !PyLong_Check(py_classval)) { |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 255 | srd_err("Options of type %s are not yet supported.", |
| 256 | Py_TYPE(py_classval)->tp_name); |
Bert Vermeulen | 130ef08 | 2012-01-19 00:00:02 +0100 | [diff] [blame] | 257 | goto err_out; |
| 258 | } |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 259 | |
| 260 | if ((value = g_hash_table_lookup(options, key))) { |
| 261 | /* An override for this option was provided. */ |
| 262 | if (PyUnicode_Check(py_classval)) { |
| 263 | if (!(py_optval = PyUnicode_FromString(value))) { |
| 264 | /* Some UTF-8 encoding error. */ |
| 265 | PyErr_Clear(); |
| 266 | goto err_out; |
| 267 | } |
| 268 | } else if (PyLong_Check(py_classval)) { |
| 269 | if (!(py_optval = PyLong_FromString(value, NULL, 0))) { |
| 270 | /* ValueError Exception */ |
| 271 | PyErr_Clear(); |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 272 | srd_err("Option %s has invalid value " |
| 273 | "%s: expected integer.", |
| 274 | key, value); |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 275 | goto err_out; |
| 276 | } |
| 277 | } |
| 278 | g_hash_table_remove(options, key); |
| 279 | } else { |
| 280 | /* Use the class default for this option. */ |
| 281 | if (PyUnicode_Check(py_classval)) { |
| 282 | /* Make a brand new copy of the string. */ |
| 283 | py_ustr = PyUnicode_AS_UNICODE(py_classval); |
| 284 | size = PyUnicode_GET_SIZE(py_classval); |
| 285 | py_optval = PyUnicode_FromUnicode(py_ustr, size); |
| 286 | } else if (PyLong_Check(py_classval)) { |
| 287 | /* Make a brand new copy of the integer. */ |
| 288 | val_ull = PyLong_AsUnsignedLongLong(py_classval); |
| 289 | if (val_ull == (unsigned long long)-1) { |
| 290 | /* OverFlowError exception */ |
| 291 | PyErr_Clear(); |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 292 | srd_err("Invalid integer value for %s: " |
| 293 | "expected integer.", key); |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 294 | goto err_out; |
| 295 | } |
| 296 | if (!(py_optval = PyLong_FromUnsignedLongLong(val_ull))) |
| 297 | goto err_out; |
| 298 | } |
| 299 | } |
| 300 | |
| 301 | /* If we got here, py_optval holds a known good new reference |
| 302 | * to the instance option to set. |
| 303 | */ |
| 304 | if (PyDict_SetItemString(py_di_options, key, py_optval) == -1) |
| 305 | goto err_out; |
| 306 | } |
| 307 | |
| 308 | ret = SRD_OK; |
| 309 | |
| 310 | err_out: |
| 311 | Py_XDECREF(py_optlist); |
| 312 | Py_XDECREF(py_di_options); |
| 313 | Py_XDECREF(py_dec_optkeys); |
| 314 | Py_XDECREF(py_dec_options); |
Uwe Hermann | 6f85831 | 2012-01-28 21:26:26 +0100 | [diff] [blame] | 315 | g_free(key); |
Bert Vermeulen | 2086c68 | 2012-01-23 04:51:33 +0100 | [diff] [blame] | 316 | if (PyErr_Occurred()) |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 317 | catch_exception("Stray exception in srd_inst_set_options()."); |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 318 | |
| 319 | return ret; |
| 320 | } |
| 321 | |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 322 | /* Helper GComparefunc for g_slist_find_custom() in srd_inst_set_probes() */ |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 323 | static gint compare_probe_id(struct srd_probe *a, char *probe_id) |
| 324 | { |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 325 | return strcmp(a->id, probe_id); |
| 326 | } |
| 327 | |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 328 | /** |
| 329 | * Set probes in a decoder instance. |
| 330 | * |
| 331 | * @param di Decoder instance. |
| 332 | * @param probes A GHashTable of probes to set. Key is probe name, value is |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 333 | * the probe number. Samples passed to this instance will be |
| 334 | * arranged in this order. |
Bert Vermeulen | 12243c2 | 2012-02-12 14:18:32 +0100 | [diff] [blame^] | 335 | * |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 336 | * @return SRD_OK upon success, a (negative) error code otherwise. |
| 337 | */ |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 338 | SRD_API int srd_inst_set_probes(struct srd_decoder_inst *di, |
Uwe Hermann | 55c3c5f | 2012-02-09 19:11:53 +0100 | [diff] [blame] | 339 | GHashTable *new_probes) |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 340 | { |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 341 | GList *l; |
| 342 | GSList *sl; |
| 343 | struct srd_probe *p; |
| 344 | int *new_probemap, new_probenum; |
Bert Vermeulen | be87326 | 2012-01-23 19:34:23 +0100 | [diff] [blame] | 345 | char *probe_id, *probenum_str; |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 346 | |
Bert Vermeulen | ce46bee | 2012-01-27 08:21:58 +0100 | [diff] [blame] | 347 | srd_dbg("set probes called for instance %s with list of %d probes", |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 348 | di->inst_id, g_hash_table_size(new_probes)); |
Bert Vermeulen | ce46bee | 2012-01-27 08:21:58 +0100 | [diff] [blame] | 349 | |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 350 | if (g_hash_table_size(new_probes) == 0) |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 351 | /* No probes provided. */ |
| 352 | return SRD_OK; |
| 353 | |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 354 | if (di->dec_num_probes == 0) { |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 355 | /* Decoder has no probes. */ |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 356 | srd_err("Protocol decoder %s has no probes to define.", |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 357 | di->decoder->name); |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 358 | return SRD_ERR_ARG; |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 359 | } |
| 360 | |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 361 | new_probemap = NULL; |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 362 | |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 363 | if (!(new_probemap = g_try_malloc(sizeof(int) * di->dec_num_probes))) { |
Uwe Hermann | a61ece2 | 2012-02-10 00:06:58 +0100 | [diff] [blame] | 364 | srd_err("Failed to g_malloc() new probe map."); |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 365 | return SRD_ERR_MALLOC; |
| 366 | } |
| 367 | |
| 368 | for (l = g_hash_table_get_keys(new_probes); l; l = l->next) { |
| 369 | probe_id = l->data; |
Bert Vermeulen | be87326 | 2012-01-23 19:34:23 +0100 | [diff] [blame] | 370 | probenum_str = g_hash_table_lookup(new_probes, probe_id); |
| 371 | if (!probenum_str) { |
| 372 | /* Probe name was specified without a value. */ |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 373 | srd_err("No probe number was specified for %s.", |
| 374 | probe_id); |
Bert Vermeulen | be87326 | 2012-01-23 19:34:23 +0100 | [diff] [blame] | 375 | g_free(new_probemap); |
| 376 | return SRD_ERR_ARG; |
| 377 | } |
| 378 | new_probenum = strtol(probenum_str, NULL, 10); |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 379 | if (!(sl = g_slist_find_custom(di->decoder->probes, probe_id, |
| 380 | (GCompareFunc)compare_probe_id))) { |
| 381 | /* Fall back on optional probes. */ |
Bert Vermeulen | dcdf488 | 2012-02-01 00:07:55 +0100 | [diff] [blame] | 382 | if (!(sl = g_slist_find_custom(di->decoder->opt_probes, |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 383 | probe_id, (GCompareFunc) compare_probe_id))) { |
| 384 | srd_err("Protocol decoder %s has no probe " |
| 385 | "'%s'.", di->decoder->name, probe_id); |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 386 | g_free(new_probemap); |
| 387 | return SRD_ERR_ARG; |
| 388 | } |
| 389 | } |
| 390 | p = sl->data; |
| 391 | new_probemap[p->order] = new_probenum; |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 392 | srd_dbg("setting probe mapping for %d = probe %d", p->order, |
| 393 | new_probenum); |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 394 | } |
| 395 | g_free(di->dec_probemap); |
| 396 | di->dec_probemap = new_probemap; |
| 397 | |
| 398 | return SRD_OK; |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 399 | } |
| 400 | |
| 401 | /** |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 402 | * Create a new protocol decoder instance. |
| 403 | * |
Uwe Hermann | 42a85ed | 2012-01-10 20:00:25 +0100 | [diff] [blame] | 404 | * @param id Decoder 'id' field. |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 405 | * @param options GHashtable of options which override the defaults set in |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 406 | * the decoder class. |
Bert Vermeulen | 12243c2 | 2012-02-12 14:18:32 +0100 | [diff] [blame^] | 407 | * |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 408 | * @return Pointer to a newly allocated struct srd_decoder_inst, or |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 409 | * NULL in case of failure. |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 410 | */ |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 411 | SRD_API struct srd_decoder_inst *srd_inst_new(const char *decoder_id, |
Uwe Hermann | 55c3c5f | 2012-02-09 19:11:53 +0100 | [diff] [blame] | 412 | GHashTable *options) |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 413 | { |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 414 | int i; |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 415 | struct srd_decoder *dec; |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 416 | struct srd_decoder_inst *di; |
| 417 | char *inst_id; |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 418 | |
Uwe Hermann | 7a1712c | 2012-01-26 01:15:10 +0100 | [diff] [blame] | 419 | srd_dbg("Creating new %s instance.", decoder_id); |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 420 | |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 421 | if (!(dec = srd_get_decoder_by_id(decoder_id))) { |
| 422 | srd_err("Protocol decoder %s not found.", decoder_id); |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 423 | return NULL; |
| 424 | } |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 425 | |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 426 | if (!(di = g_try_malloc0(sizeof(struct srd_decoder_inst)))) { |
Uwe Hermann | a61ece2 | 2012-02-10 00:06:58 +0100 | [diff] [blame] | 427 | srd_err("Failed to g_malloc() instance."); |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 428 | return NULL; |
| 429 | } |
| 430 | |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 431 | inst_id = g_hash_table_lookup(options, "id"); |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 432 | di->decoder = dec; |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 433 | di->inst_id = g_strdup(inst_id ? inst_id : decoder_id); |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 434 | g_hash_table_remove(options, "id"); |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 435 | |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 436 | /* Prepare a default probe map, where samples come in the |
| 437 | * order in which the decoder class defined them. |
| 438 | */ |
| 439 | di->dec_num_probes = g_slist_length(di->decoder->probes) + |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 440 | g_slist_length(di->decoder->opt_probes); |
Bert Vermeulen | 19a90ba | 2012-01-21 19:45:04 +0100 | [diff] [blame] | 441 | if (di->dec_num_probes) { |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 442 | if (!(di->dec_probemap = |
| 443 | g_try_malloc(sizeof(int) * di->dec_num_probes))) { |
Uwe Hermann | a61ece2 | 2012-02-10 00:06:58 +0100 | [diff] [blame] | 444 | srd_err("Failed to g_malloc() probe map."); |
Bert Vermeulen | 19a90ba | 2012-01-21 19:45:04 +0100 | [diff] [blame] | 445 | g_free(di); |
| 446 | return NULL; |
| 447 | } |
| 448 | for (i = 0; i < di->dec_num_probes; i++) |
| 449 | di->dec_probemap[i] = i; |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 450 | } |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 451 | |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 452 | /* Create a new instance of this decoder class. */ |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 453 | if (!(di->py_inst = PyObject_CallObject(dec->py_dec, NULL))) { |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 454 | if (PyErr_Occurred()) |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 455 | catch_exception("failed to create %s instance: ", |
| 456 | decoder_id); |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 457 | g_free(di->dec_probemap); |
| 458 | g_free(di); |
| 459 | return NULL; |
| 460 | } |
| 461 | |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 462 | if (srd_inst_set_options(di, options) != SRD_OK) { |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 463 | g_free(di->dec_probemap); |
Bert Vermeulen | 0bdadba | 2012-01-17 03:37:34 +0100 | [diff] [blame] | 464 | g_free(di); |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 465 | return NULL; |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 466 | } |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 467 | |
| 468 | /* Instance takes input from a frontend by default. */ |
Bert Vermeulen | e508088 | 2011-12-07 09:56:49 +0100 | [diff] [blame] | 469 | di_list = g_slist_append(di_list, di); |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 470 | |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 471 | return di; |
| 472 | } |
| 473 | |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 474 | SRD_API int srd_inst_stack(struct srd_decoder_inst *di_from, |
| 475 | struct srd_decoder_inst *di_to) |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 476 | { |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 477 | if (!di_from || !di_to) { |
Bert Vermeulen | d906d3f | 2012-01-22 02:51:49 +0100 | [diff] [blame] | 478 | srd_err("Invalid from/to instance pair."); |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 479 | return SRD_ERR_ARG; |
| 480 | } |
| 481 | |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 482 | if (g_slist_find(di_list, di_to)) { |
| 483 | /* Remove from the unstacked list. */ |
| 484 | di_list = g_slist_remove(di_list, di_to); |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 485 | } |
| 486 | |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 487 | /* Stack on top of source di. */ |
| 488 | di_from->next_di = g_slist_append(di_from->next_di, di_to); |
| 489 | |
| 490 | return SRD_OK; |
| 491 | } |
| 492 | |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 493 | /** |
| 494 | * Finds a decoder instance by its instance id, but only in the bottom |
| 495 | * level of instances -- instances already stacked on top of another one |
| 496 | * will not be found. |
| 497 | * |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 498 | * @param inst_id The instance id to be found. |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 499 | * |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 500 | * @return Pointer to struct srd_decoder_inst, or NULL if not found. |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 501 | */ |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 502 | SRD_API struct srd_decoder_inst *srd_inst_find_by_id(char *inst_id) |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 503 | { |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 504 | GSList *l; |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 505 | struct srd_decoder_inst *tmp, *di; |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 506 | |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 507 | di = NULL; |
| 508 | for (l = di_list; l; l = l->next) { |
| 509 | tmp = l->data; |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 510 | if (!strcmp(tmp->inst_id, inst_id)) { |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 511 | di = tmp; |
| 512 | break; |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 513 | } |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 514 | } |
| 515 | |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 516 | return di; |
| 517 | } |
| 518 | |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 519 | /** |
Uwe Hermann | 511e212 | 2012-02-10 09:29:38 +0100 | [diff] [blame] | 520 | * Finds a decoder instance by its Python object, i.e. that instance's |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 521 | * instantiation of the sigrokdecode.Decoder class. This will recurse |
| 522 | * to find the instance anywhere in the stack tree. |
| 523 | * |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 524 | * @param stack Pointer to a GSList of struct srd_decoder_inst, |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 525 | * indicating the stack to search. To start searching at the bottom |
| 526 | * level of decoder instances, pass NULL. |
Uwe Hermann | 511e212 | 2012-02-10 09:29:38 +0100 | [diff] [blame] | 527 | * @param obj The Python class instantiation. |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 528 | * |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 529 | * @return Pointer to struct srd_decoder_inst, or NULL if not found. |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 530 | */ |
Bert Vermeulen | ee4ed22 | 2012-02-12 13:47:07 +0100 | [diff] [blame] | 531 | SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj(GSList *stack, |
Uwe Hermann | 55c3c5f | 2012-02-09 19:11:53 +0100 | [diff] [blame] | 532 | PyObject *obj) |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 533 | { |
| 534 | GSList *l; |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 535 | struct srd_decoder_inst *tmp, *di; |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 536 | |
| 537 | di = NULL; |
| 538 | for (l = stack ? stack : di_list; di == NULL && l != NULL; l = l->next) { |
| 539 | tmp = l->data; |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 540 | if (tmp->py_inst == obj) |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 541 | di = tmp; |
| 542 | else if (tmp->next_di) |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 543 | di = srd_inst_find_by_obj(tmp->next_di, obj); |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 544 | } |
| 545 | |
| 546 | return di; |
| 547 | } |
| 548 | |
Bert Vermeulen | ee4ed22 | 2012-02-12 13:47:07 +0100 | [diff] [blame] | 549 | SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di, PyObject *args) |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 550 | { |
| 551 | PyObject *py_name, *py_res; |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 552 | GSList *l; |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 553 | struct srd_decoder_inst *next_di; |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 554 | |
Uwe Hermann | 7a1712c | 2012-01-26 01:15:10 +0100 | [diff] [blame] | 555 | srd_dbg("Calling start() method on protocol decoder instance %s.", |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 556 | di->inst_id); |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 557 | |
| 558 | if (!(py_name = PyUnicode_FromString("start"))) { |
Uwe Hermann | 511e212 | 2012-02-10 09:29:38 +0100 | [diff] [blame] | 559 | srd_err("Unable to build Python object for 'start'."); |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 560 | catch_exception("Protocol decoder instance %s: ", |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 561 | di->inst_id); |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 562 | return SRD_ERR_PYTHON; |
| 563 | } |
| 564 | |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 565 | if (!(py_res = PyObject_CallMethodObjArgs(di->py_inst, |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 566 | py_name, args, NULL))) { |
| 567 | catch_exception("Protocol decoder instance %s: ", |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 568 | di->inst_id); |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 569 | return SRD_ERR_PYTHON; |
| 570 | } |
| 571 | |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 572 | Py_DecRef(py_res); |
| 573 | Py_DecRef(py_name); |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 574 | |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 575 | /* Start all the PDs stacked on top of this one. Pass along the |
| 576 | * metadata all the way from the bottom PD, even though it's only |
| 577 | * applicable to logic data for now. |
| 578 | */ |
| 579 | for (l = di->next_di; l; l = l->next) { |
| 580 | next_di = l->data; |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 581 | srd_inst_start(next_di, args); |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 582 | } |
| 583 | |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 584 | return SRD_OK; |
| 585 | } |
| 586 | |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 587 | /** |
| 588 | * Run the specified decoder function. |
| 589 | * |
Bert Vermeulen | d906d3f | 2012-01-22 02:51:49 +0100 | [diff] [blame] | 590 | * @param start_samplenum The starting sample number for the buffer's sample |
Uwe Hermann | 7a1712c | 2012-01-26 01:15:10 +0100 | [diff] [blame] | 591 | * set, relative to the start of capture. |
| 592 | * @param di The decoder instance to call. Must not be NULL. |
| 593 | * @param inbuf The buffer to decode. Must not be NULL. |
| 594 | * @param inbuflen Length of the buffer. Must be > 0. |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 595 | * |
| 596 | * @return SRD_OK upon success, a (negative) error code otherwise. |
| 597 | */ |
Bert Vermeulen | 12243c2 | 2012-02-12 14:18:32 +0100 | [diff] [blame^] | 598 | SRD_PRIV int srd_inst_decode(uint64_t start_samplenum, |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 599 | struct srd_decoder_inst *di, |
Uwe Hermann | 55c3c5f | 2012-02-09 19:11:53 +0100 | [diff] [blame] | 600 | uint8_t *inbuf, uint64_t inbuflen) |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 601 | { |
Bert Vermeulen | d906d3f | 2012-01-22 02:51:49 +0100 | [diff] [blame] | 602 | PyObject *py_res; |
Bert Vermeulen | bc5f5a4 | 2012-01-05 03:31:36 +0100 | [diff] [blame] | 603 | srd_logic *logic; |
Bert Vermeulen | 8652829 | 2012-01-15 23:20:39 +0100 | [diff] [blame] | 604 | uint64_t end_samplenum; |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 605 | |
Uwe Hermann | 7a1712c | 2012-01-26 01:15:10 +0100 | [diff] [blame] | 606 | srd_dbg("Calling decode() on instance %s with %d bytes starting " |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 607 | "at sample %d.", di->inst_id, inbuflen, start_samplenum); |
Bert Vermeulen | d906d3f | 2012-01-22 02:51:49 +0100 | [diff] [blame] | 608 | |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 609 | /* Return an error upon unusable input. */ |
Uwe Hermann | 7a1712c | 2012-01-26 01:15:10 +0100 | [diff] [blame] | 610 | if (!di) { |
| 611 | srd_dbg("empty decoder instance"); |
Bert Vermeulen | d906d3f | 2012-01-22 02:51:49 +0100 | [diff] [blame] | 612 | return SRD_ERR_ARG; |
| 613 | } |
Uwe Hermann | 7a1712c | 2012-01-26 01:15:10 +0100 | [diff] [blame] | 614 | if (!inbuf) { |
| 615 | srd_dbg("NULL buffer pointer"); |
Bert Vermeulen | d906d3f | 2012-01-22 02:51:49 +0100 | [diff] [blame] | 616 | return SRD_ERR_ARG; |
| 617 | } |
| 618 | if (inbuflen == 0) { |
Uwe Hermann | 7a1712c | 2012-01-26 01:15:10 +0100 | [diff] [blame] | 619 | srd_dbg("empty buffer"); |
Bert Vermeulen | d906d3f | 2012-01-22 02:51:49 +0100 | [diff] [blame] | 620 | return SRD_ERR_ARG; |
| 621 | } |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 622 | |
Bert Vermeulen | d906d3f | 2012-01-22 02:51:49 +0100 | [diff] [blame] | 623 | /* Create new srd_logic object. Each iteration around the PD's loop |
| 624 | * will fill one sample into this object. |
| 625 | */ |
Bert Vermeulen | bc5f5a4 | 2012-01-05 03:31:36 +0100 | [diff] [blame] | 626 | logic = PyObject_New(srd_logic, &srd_logic_type); |
| 627 | Py_INCREF(logic); |
| 628 | logic->di = di; |
Bert Vermeulen | 8652829 | 2012-01-15 23:20:39 +0100 | [diff] [blame] | 629 | logic->start_samplenum = start_samplenum; |
Bert Vermeulen | bc5f5a4 | 2012-01-05 03:31:36 +0100 | [diff] [blame] | 630 | logic->itercnt = 0; |
| 631 | logic->inbuf = inbuf; |
| 632 | logic->inbuflen = inbuflen; |
| 633 | logic->sample = PyList_New(2); |
| 634 | Py_INCREF(logic->sample); |
| 635 | |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 636 | Py_IncRef(di->py_inst); |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 637 | end_samplenum = start_samplenum + inbuflen / di->data_unitsize; |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 638 | if (!(py_res = PyObject_CallMethod(di->py_inst, "decode", |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 639 | "KKO", logic->start_samplenum, |
| 640 | end_samplenum, logic))) { |
| 641 | catch_exception("Protocol decoder instance %s: ", |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 642 | di->inst_id); |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 643 | return SRD_ERR_PYTHON; /* TODO: More specific error? */ |
| 644 | } |
Bert Vermeulen | d906d3f | 2012-01-22 02:51:49 +0100 | [diff] [blame] | 645 | Py_DecRef(py_res); |
Bert Vermeulen | bc5f5a4 | 2012-01-05 03:31:36 +0100 | [diff] [blame] | 646 | |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 647 | return SRD_OK; |
| 648 | } |
| 649 | |
Bert Vermeulen | 12243c2 | 2012-02-12 14:18:32 +0100 | [diff] [blame^] | 650 | SRD_PRIV void srd_inst_free(struct srd_decoder_inst *di) |
Bert Vermeulen | fa12a21 | 2012-01-31 23:48:10 +0100 | [diff] [blame] | 651 | { |
| 652 | GSList *l; |
| 653 | struct srd_pd_output *pdo; |
| 654 | |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 655 | srd_dbg("Freeing instance %s", di->inst_id); |
Bert Vermeulen | fa12a21 | 2012-01-31 23:48:10 +0100 | [diff] [blame] | 656 | |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 657 | Py_DecRef(di->py_inst); |
| 658 | g_free(di->inst_id); |
Bert Vermeulen | fa12a21 | 2012-01-31 23:48:10 +0100 | [diff] [blame] | 659 | g_free(di->dec_probemap); |
| 660 | g_slist_free(di->next_di); |
| 661 | for (l = di->pd_output; l; l = l->next) { |
| 662 | pdo = l->data; |
| 663 | g_free(pdo->proto_id); |
| 664 | g_free(pdo); |
| 665 | } |
| 666 | g_slist_free(di->pd_output); |
Bert Vermeulen | fa12a21 | 2012-01-31 23:48:10 +0100 | [diff] [blame] | 667 | } |
| 668 | |
Bert Vermeulen | 12243c2 | 2012-02-12 14:18:32 +0100 | [diff] [blame^] | 669 | SRD_PRIV void srd_inst_free_all(GSList *stack) |
Bert Vermeulen | fa12a21 | 2012-01-31 23:48:10 +0100 | [diff] [blame] | 670 | { |
| 671 | GSList *l; |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 672 | struct srd_decoder_inst *di; |
Bert Vermeulen | fa12a21 | 2012-01-31 23:48:10 +0100 | [diff] [blame] | 673 | |
| 674 | di = NULL; |
| 675 | for (l = stack ? stack : di_list; di == NULL && l != NULL; l = l->next) { |
| 676 | di = l->data; |
| 677 | if (di->next_di) |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 678 | srd_inst_free_all(di->next_di); |
| 679 | srd_inst_free(di); |
Bert Vermeulen | fa12a21 | 2012-01-31 23:48:10 +0100 | [diff] [blame] | 680 | } |
| 681 | if (!stack) { |
| 682 | g_slist_free(di_list); |
| 683 | di_list = NULL; |
| 684 | } |
Bert Vermeulen | fa12a21 | 2012-01-31 23:48:10 +0100 | [diff] [blame] | 685 | } |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 686 | |
Uwe Hermann | 55c3c5f | 2012-02-09 19:11:53 +0100 | [diff] [blame] | 687 | SRD_API int srd_session_start(int num_probes, int unitsize, uint64_t samplerate) |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 688 | { |
| 689 | PyObject *args; |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 690 | GSList *d; |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 691 | struct srd_decoder_inst *di; |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 692 | int ret; |
| 693 | |
Uwe Hermann | 7a1712c | 2012-01-26 01:15:10 +0100 | [diff] [blame] | 694 | srd_dbg("Calling start() on all instances with %d probes, " |
| 695 | "unitsize %d samplerate %d.", num_probes, unitsize, samplerate); |
Bert Vermeulen | d906d3f | 2012-01-22 02:51:49 +0100 | [diff] [blame] | 696 | |
| 697 | /* Currently only one item of metadata is passed along to decoders, |
| 698 | * samplerate. This can be extended as needed. |
| 699 | */ |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 700 | if (!(args = Py_BuildValue("{s:l}", "samplerate", (long)samplerate))) { |
Uwe Hermann | 511e212 | 2012-02-10 09:29:38 +0100 | [diff] [blame] | 701 | srd_err("Unable to build Python object for metadata."); |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 702 | return SRD_ERR_PYTHON; |
| 703 | } |
| 704 | |
| 705 | /* Run the start() method on all decoders receiving frontend data. */ |
| 706 | for (d = di_list; d; d = d->next) { |
| 707 | di = d->data; |
Bert Vermeulen | f38ec28 | 2012-01-20 22:25:42 +0100 | [diff] [blame] | 708 | di->data_num_probes = num_probes; |
| 709 | di->data_unitsize = unitsize; |
| 710 | di->data_samplerate = samplerate; |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 711 | if ((ret = srd_inst_start(di, args) != SRD_OK)) |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 712 | break; |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 713 | } |
| 714 | |
Bert Vermeulen | d906d3f | 2012-01-22 02:51:49 +0100 | [diff] [blame] | 715 | Py_DecRef(args); |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 716 | |
Bert Vermeulen | 2072ae0 | 2012-01-25 01:49:35 +0100 | [diff] [blame] | 717 | return ret; |
Bert Vermeulen | 7ce7775 | 2012-01-10 00:25:16 +0100 | [diff] [blame] | 718 | } |
| 719 | |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 720 | /* Feed logic samples to decoder session. */ |
Uwe Hermann | 55c3c5f | 2012-02-09 19:11:53 +0100 | [diff] [blame] | 721 | SRD_API int srd_session_feed(uint64_t start_samplenum, uint8_t * inbuf, |
| 722 | uint64_t inbuflen) |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 723 | { |
| 724 | GSList *d; |
| 725 | int ret; |
| 726 | |
Uwe Hermann | 7a1712c | 2012-01-26 01:15:10 +0100 | [diff] [blame] | 727 | srd_dbg("Calling decode() on all instances with starting sample " |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 728 | "number %" PRIu64 ", %" PRIu64 " bytes at 0x%p", |
| 729 | start_samplenum, inbuflen, inbuf); |
Bert Vermeulen | d906d3f | 2012-01-22 02:51:49 +0100 | [diff] [blame] | 730 | |
Bert Vermeulen | e508088 | 2011-12-07 09:56:49 +0100 | [diff] [blame] | 731 | for (d = di_list; d; d = d->next) { |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 732 | if ((ret = srd_inst_decode(start_samplenum, d->data, inbuf, |
Uwe Hermann | c9bfccc | 2012-02-08 22:39:30 +0100 | [diff] [blame] | 733 | inbuflen)) != SRD_OK) |
Bert Vermeulen | b2c1961 | 2011-12-04 10:33:02 +0100 | [diff] [blame] | 734 | return ret; |
| 735 | } |
| 736 | |
| 737 | return SRD_OK; |
| 738 | } |
| 739 | |
Uwe Hermann | ae53d0a | 2012-02-11 22:38:17 +0100 | [diff] [blame] | 740 | SRD_API int srd_register_callback(int output_type, |
Uwe Hermann | e09023b | 2012-02-11 22:09:18 +0100 | [diff] [blame] | 741 | srd_pd_output_callback_t cb, void *user_data) |
Bert Vermeulen | 4fadb12 | 2012-01-22 03:29:22 +0100 | [diff] [blame] | 742 | { |
| 743 | struct srd_pd_callback *pd_cb; |
| 744 | |
Uwe Hermann | 7a1712c | 2012-01-26 01:15:10 +0100 | [diff] [blame] | 745 | srd_dbg("Registering new callback for output type %d.", output_type); |
Bert Vermeulen | 4fadb12 | 2012-01-22 03:29:22 +0100 | [diff] [blame] | 746 | |
Uwe Hermann | a61ece2 | 2012-02-10 00:06:58 +0100 | [diff] [blame] | 747 | if (!(pd_cb = g_try_malloc(sizeof(struct srd_pd_callback)))) { |
| 748 | srd_err("Failed to g_malloc() struct srd_pd_callback."); |
Bert Vermeulen | 4fadb12 | 2012-01-22 03:29:22 +0100 | [diff] [blame] | 749 | return SRD_ERR_MALLOC; |
Uwe Hermann | a61ece2 | 2012-02-10 00:06:58 +0100 | [diff] [blame] | 750 | } |
Bert Vermeulen | 4fadb12 | 2012-01-22 03:29:22 +0100 | [diff] [blame] | 751 | |
| 752 | pd_cb->output_type = output_type; |
| 753 | pd_cb->callback = cb; |
Uwe Hermann | e09023b | 2012-02-11 22:09:18 +0100 | [diff] [blame] | 754 | pd_cb->user_data = user_data; |
Bert Vermeulen | 4fadb12 | 2012-01-22 03:29:22 +0100 | [diff] [blame] | 755 | callbacks = g_slist_append(callbacks, pd_cb); |
| 756 | |
| 757 | return SRD_OK; |
| 758 | } |
| 759 | |
Uwe Hermann | 55c3c5f | 2012-02-09 19:11:53 +0100 | [diff] [blame] | 760 | SRD_API void *srd_find_callback(int output_type) |
Bert Vermeulen | 4fadb12 | 2012-01-22 03:29:22 +0100 | [diff] [blame] | 761 | { |
| 762 | GSList *l; |
| 763 | struct srd_pd_callback *pd_cb; |
| 764 | void *(cb); |
| 765 | |
| 766 | cb = NULL; |
| 767 | for (l = callbacks; l; l = l->next) { |
| 768 | pd_cb = l->data; |
| 769 | if (pd_cb->output_type == output_type) { |
| 770 | cb = pd_cb->callback; |
| 771 | break; |
| 772 | } |
| 773 | } |
| 774 | |
| 775 | return cb; |
| 776 | } |
| 777 | |
Uwe Hermann | 511e212 | 2012-02-10 09:29:38 +0100 | [diff] [blame] | 778 | /* This is the backend function to Python sigrokdecode.add() call. */ |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 779 | SRD_PRIV int pd_add(struct srd_decoder_inst *di, int output_type, |
Uwe Hermann | 55c3c5f | 2012-02-09 19:11:53 +0100 | [diff] [blame] | 780 | char *proto_id) |
Bert Vermeulen | e508088 | 2011-12-07 09:56:49 +0100 | [diff] [blame] | 781 | { |
Bert Vermeulen | e508088 | 2011-12-07 09:56:49 +0100 | [diff] [blame] | 782 | struct srd_pd_output *pdo; |
Bert Vermeulen | e508088 | 2011-12-07 09:56:49 +0100 | [diff] [blame] | 783 | |
Uwe Hermann | 7a1712c | 2012-01-26 01:15:10 +0100 | [diff] [blame] | 784 | srd_dbg("Instance %s creating new output type %d for %s.", |
Bert Vermeulen | a8b72b0 | 2012-02-11 18:06:56 +0100 | [diff] [blame] | 785 | di->inst_id, output_type, proto_id); |
Bert Vermeulen | d906d3f | 2012-01-22 02:51:49 +0100 | [diff] [blame] | 786 | |
Uwe Hermann | a61ece2 | 2012-02-10 00:06:58 +0100 | [diff] [blame] | 787 | if (!(pdo = g_try_malloc(sizeof(struct srd_pd_output)))) { |
| 788 | srd_err("Failed to g_malloc() struct srd_pd_output."); |
Bert Vermeulen | e508088 | 2011-12-07 09:56:49 +0100 | [diff] [blame] | 789 | return -1; |
Uwe Hermann | a61ece2 | 2012-02-10 00:06:58 +0100 | [diff] [blame] | 790 | } |
Bert Vermeulen | e508088 | 2011-12-07 09:56:49 +0100 | [diff] [blame] | 791 | |
Bert Vermeulen | b231546 | 2012-01-09 00:13:03 +0100 | [diff] [blame] | 792 | /* pdo_id is just a simple index, nothing is deleted from this list anyway. */ |
Bert Vermeulen | 1596994 | 2012-01-07 02:50:14 +0100 | [diff] [blame] | 793 | pdo->pdo_id = g_slist_length(di->pd_output); |
Bert Vermeulen | e508088 | 2011-12-07 09:56:49 +0100 | [diff] [blame] | 794 | pdo->output_type = output_type; |
Bert Vermeulen | b3b2cae | 2012-01-24 02:02:03 +0100 | [diff] [blame] | 795 | pdo->di = di; |
Uwe Hermann | 94d43b3 | 2012-01-10 20:44:22 +0100 | [diff] [blame] | 796 | pdo->proto_id = g_strdup(proto_id); |
Bert Vermeulen | e508088 | 2011-12-07 09:56:49 +0100 | [diff] [blame] | 797 | di->pd_output = g_slist_append(di->pd_output, pdo); |
| 798 | |
Bert Vermeulen | 1596994 | 2012-01-07 02:50:14 +0100 | [diff] [blame] | 799 | return pdo->pdo_id; |
Bert Vermeulen | e508088 | 2011-12-07 09:56:49 +0100 | [diff] [blame] | 800 | } |