cc1101: Simplify format_command().

[libsigrokdecode.git] / decoder.c

diff --git a/decoder.c b/decoder.c
index 87df2ad8f839d552494b1c6b6969a5167e5684f4..5239818faa33a8fb9b8f8e4cd55faf5cba69a774 100644 (file)
--- a/decoder.c
+++ b/decoder.c
@@ -171,6 +171,7 @@ static void decoder_free(struct srd_decoder *dec)
 
        g_slist_free_full(dec->outputs, g_free);
        g_slist_free_full(dec->inputs, g_free);
+       g_slist_free_full(dec->tags, g_free);
        g_free(dec->license);
        g_free(dec->desc);
        g_free(dec->longname);
@@ -243,6 +244,7 @@ static int get_channels(const struct srd_decoder *d, const char *attr,
 except_out:
        srd_exception_catch("Failed to get %s list of %s decoder",
                        attr, d->name);
+
 err_out:
        g_slist_free_full(pdchl, &channel_free);
        Py_XDECREF(py_channellist);
@@ -324,8 +326,10 @@ static int get_options(struct srd_decoder *d)
 
                py_values = PyDict_GetItemString(py_opt, "values");
                if (py_values) {
-                       /* A default is required if a list of values is
-                        * given, since it's used to verify their type. */
+                       /*
+                        * A default is required if a list of values is
+                        * given, since it's used to verify their type.
+                        */
                        if (!o->def) {
                                srd_err("No default for option '%s'.", o->id);
                                goto err_out;
@@ -365,6 +369,7 @@ static int get_options(struct srd_decoder *d)
 
 except_out:
        srd_exception_catch("Failed to get %s decoder options", d->name);
+
 err_out:
        g_slist_free_full(options, &decoder_option_free);
        Py_XDECREF(py_opts);
@@ -373,8 +378,7 @@ err_out:
        return SRD_ERR_PYTHON;
 }
 
-/* Convert annotation class attribute to GSList of char **.
- */
+/* Convert annotation class attribute to GSList of char **. */
 static int get_annotations(struct srd_decoder *dec)
 {
        PyObject *py_annlist, *py_ann;
@@ -426,6 +430,7 @@ static int get_annotations(struct srd_decoder *dec)
 
 except_out:
        srd_exception_catch("Failed to get %s decoder annotations", dec->name);
+
 err_out:
        g_slist_free_full(annotations, (GDestroyNotify)&g_strfreev);
        Py_XDECREF(py_annlist);
@@ -434,8 +439,7 @@ err_out:
        return SRD_ERR_PYTHON;
 }
 
-/* Convert annotation_rows to GSList of 'struct srd_decoder_annotation_row'.
- */
+/* Convert annotation_rows to GSList of 'struct srd_decoder_annotation_row'. */
 static int get_annotation_rows(struct srd_decoder *dec)
 {
        PyObject *py_ann_rows, *py_ann_row, *py_ann_classes, *py_item;
@@ -530,6 +534,7 @@ static int get_annotation_rows(struct srd_decoder *dec)
 except_out:
        srd_exception_catch("Failed to get %s decoder annotation rows",
                        dec->name);
+
 err_out:
        g_slist_free_full(annotation_rows, &annotation_row_free);
        Py_XDECREF(py_ann_rows);
@@ -538,8 +543,7 @@ err_out:
        return SRD_ERR_PYTHON;
 }
 
-/* Convert binary classes to GSList of char **.
- */
+/* Convert binary classes to GSList of char **. */
 static int get_binary_classes(struct srd_decoder *dec)
 {
        PyObject *py_bin_classes, *py_bin_class;
@@ -593,6 +597,7 @@ static int get_binary_classes(struct srd_decoder *dec)
 except_out:
        srd_exception_catch("Failed to get %s decoder binary classes",
                        dec->name);
+
 err_out:
        g_slist_free_full(bin_classes, (GDestroyNotify)&g_strfreev);
        Py_XDECREF(py_bin_classes);
@@ -601,8 +606,7 @@ err_out:
        return SRD_ERR_PYTHON;
 }
 
-/* Check whether the Decoder class defines the named method.
- */
+/* Check whether the Decoder class defines the named method. */
 static int check_method(PyObject *py_dec, const char *mod_name,
                const char *method_name)
 {
@@ -746,8 +750,13 @@ SRD_API int srd_decoder_load(const char *module_name)
                goto err_out;
        }
 
-       /* Check Decoder class for required methods.
-        */
+       /* Check Decoder class for required methods. */
+
+       if (check_method(d->py_dec, module_name, "reset") != SRD_OK) {
+               fail_txt = "no 'reset()' method";
+               goto err_out;
+       }
+
        if (check_method(d->py_dec, module_name, "start") != SRD_OK) {
                fail_txt = "no 'start()' method";
                goto err_out;
@@ -794,6 +803,11 @@ SRD_API int srd_decoder_load(const char *module_name)
                goto err_out;
        }
 
+       if (py_attr_as_strlist(d->py_dec, "tags", &(d->tags)) != SRD_OK) {
+               fail_txt = "missing or malformed 'tags' attribute";
+               goto err_out;
+       }
+
        /* All options and their default values. */
        if (get_options(d) != SRD_OK) {
                fail_txt = "cannot get options";
@@ -842,6 +856,7 @@ except_out:
                                    module_name, fail_txt);
        }
        fail_txt = NULL;
+
 err_out:
        if (fail_txt)
                srd_err("Failed to load decoder %s: %s", module_name, fail_txt);
@@ -1027,21 +1042,21 @@ static void srd_decoder_load_all_path(char *path)
        const gchar *direntry;
 
        if (!(dir = g_dir_open(path, 0, NULL))) {
-               /* Not really fatal */
-               /* Try zipimport method too */
+               /* Not really fatal. Try zipimport method too. */
                srd_decoder_load_all_zip_path(path);
                return;
        }
 
-       /* This ignores errors returned by srd_decoder_load(). That
+       /*
+        * This ignores errors returned by srd_decoder_load(). That
         * function will have logged the cause, but in any case we
-        * want to continue anyway. */
+        * want to continue anyway.
+        */
        while ((direntry = g_dir_read_name(dir)) != NULL) {
                /* The directory name is the module name (e.g. "i2c"). */
                srd_decoder_load(direntry);
        }
        g_dir_close(dir);
-
 }
 
 /**
@@ -1064,6 +1079,13 @@ SRD_API int srd_decoder_load_all(void)
        return SRD_OK;
 }
 
+static void srd_decoder_unload_cb(void *arg, void *ignored)
+{
+       (void)ignored;
+
+       srd_decoder_unload((struct srd_decoder *)arg);
+}
+
 /**
  * Unload all loaded protocol decoders.
  *
@@ -1073,7 +1095,7 @@ SRD_API int srd_decoder_load_all(void)
  */
 SRD_API int srd_decoder_unload_all(void)
 {
-       g_slist_foreach(pd_list, (GFunc)srd_decoder_unload, NULL);
+       g_slist_foreach(pd_list, srd_decoder_unload_cb, NULL);
        g_slist_free(pd_list);
        pd_list = NULL;