rigol-ds: replace some magic numbers by appropriate constant or variable

[libsigrok.git] / src / backend.c

diff --git a/src/backend.c b/src/backend.c
index f650fe1206edb36bcf0eb0b023b036c84b0902ab..48472bae55bc1ecb7e4659ab40f8da8016e5153b 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -55,7 +55,7 @@
  *
  * @section sec_mailinglists Mailing lists
  *
- * There are two mailing lists for sigrok/libsigrok: <a href="https://lists.sourceforge.net/lists/listinfo/sigrok-devel">sigrok-devel</a> and <a href="https://lists.sourceforge.net/lists/listinfo/sigrok-commits">sigrok-commits</a>.
+ * There is one mailing list for sigrok/libsigrok: <a href="https://lists.sourceforge.net/lists/listinfo/sigrok-devel">sigrok-devel</a>.
  *
  * @section sec_irc IRC
  *
@@ -215,7 +215,7 @@ static int sanity_check_all_drivers(void)
 static int sanity_check_all_input_modules(void)
 {
        int i, errors, ret = SR_OK;
-       struct sr_input_format **inputs;
+       const struct sr_input_module **inputs;
        const char *d;
 
        sr_spew("Sanity-checking all input modules.");
@@ -230,20 +230,20 @@ static int sanity_check_all_input_modules(void)
                        sr_err("No ID in module %d ('%s').", i, d);
                        errors++;
                }
-               if (!inputs[i]->description) {
-                       sr_err("No description in module %d ('%s').", i, d);
+               if (!inputs[i]->name) {
+                       sr_err("No name in module %d ('%s').", i, d);
                        errors++;
                }
-               if (!inputs[i]->format_match) {
-                       sr_err("No format_match in module %d ('%s').", i, d);
+               if (!inputs[i]->desc) {
+                       sr_err("No description in module %d ('%s').", i, d);
                        errors++;
                }
                if (!inputs[i]->init) {
                        sr_err("No init in module %d ('%s').", i, d);
                        errors++;
                }
-               if (!inputs[i]->loadfile) {
-                       sr_err("No loadfile in module %d ('%s').", i, d);
+               if (!inputs[i]->receive) {
+                       sr_err("No receive in module %d ('%s').", i, d);
                        errors++;
                }
 
@@ -265,7 +265,7 @@ static int sanity_check_all_input_modules(void)
 static int sanity_check_all_output_modules(void)
 {
        int i, errors, ret = SR_OK;
-       struct sr_output_format **outputs;
+       const struct sr_output_module **outputs;
        const char *d;
 
        sr_spew("Sanity-checking all output modules.");
@@ -280,7 +280,11 @@ static int sanity_check_all_output_modules(void)
                        sr_err("No ID in module %d ('%s').", i, d);
                        errors++;
                }
-               if (!outputs[i]->description) {
+               if (!outputs[i]->name) {
+                       sr_err("No name in module %d ('%s').", i, d);
+                       errors++;
+               }
+               if (!outputs[i]->desc) {
                        sr_err("No description in module '%s'.", d);
                        errors++;
                }