srd: minor code cleanup

diff --git a/controller.c b/controller.c
index c696dd370850894d36b9cc0ae30b795b3f3ceaad..d2056915b831c961c90cc1373ecf395c89e7f478 100644 (file)
--- a/controller.c
+++ b/controller.c
@@ -275,6 +275,7 @@ err_out:
        return ret;
 }
 
+/* Helper GComparefunc for g_slist_find_custom() in srd_instance_set_probes() */
 static gint compare_probe_id(struct srd_probe *a, char *probe_id)
 {
 
@@ -604,6 +605,41 @@ int srd_session_feed(uint64_t start_samplenum, uint8_t *inbuf, uint64_t inbuflen
 }
 
 
+int srd_register_callback(int output_type, void *cb)
+{
+       struct srd_pd_callback *pd_cb;
+
+       srd_dbg("srd: registering new callback for output type %d", output_type);
+
+       if (!(pd_cb = g_try_malloc(sizeof(struct srd_pd_callback))))
+               return SRD_ERR_MALLOC;
+
+       pd_cb->output_type = output_type;
+       pd_cb->callback = cb;
+       callbacks = g_slist_append(callbacks, pd_cb);
+
+       return SRD_OK;
+}
+
+void *srd_find_callback(int output_type)
+{
+       GSList *l;
+       struct srd_pd_callback *pd_cb;
+       void *(cb);
+
+       cb = NULL;
+       for (l = callbacks; l; l = l->next) {
+               pd_cb = l->data;
+               if (pd_cb->output_type == output_type) {
+                       cb = pd_cb->callback;
+                       break;
+               }
+       }
+
+       return cb;
+}
+
+
 /* This is the backend function to python sigrokdecode.add() call. */
 int pd_add(struct srd_decoder_instance *di, int output_type,
                char *proto_id)
@@ -646,37 +682,3 @@ struct srd_decoder_instance *get_di_by_decobject(void *decobject)
        return NULL;
 }
 
-int srd_register_callback(int output_type, void *cb)
-{
-       struct srd_pd_callback *pd_cb;
-
-       srd_dbg("srd: registering new callback for output type %d", output_type);
-
-       if (!(pd_cb = g_try_malloc(sizeof(struct srd_pd_callback))))
-               return SRD_ERR_MALLOC;
-
-       pd_cb->output_type = output_type;
-       pd_cb->callback = cb;
-       callbacks = g_slist_append(callbacks, pd_cb);
-
-       return SRD_OK;
-}
-
-void *srd_find_callback(int output_type)
-{
-       GSList *l;
-       struct srd_pd_callback *pd_cb;
-       void *(cb);
-
-       cb = NULL;
-       for (l = callbacks; l; l = l->next) {
-               pd_cb = l->data;
-               if (pd_cb->output_type == output_type) {
-                       cb = pd_cb->callback;
-                       break;
-               }
-       }
-
-       return cb;
-}
-

diff --git a/decoder.c b/decoder.c
index a5c5e53fb00162809f490aaa4213926acea3c3f4..d29a6d6a9472208673ca0ec27ed03428638d8239 100644 (file)
--- a/decoder.c
+++ b/decoder.c
@@ -2,7 +2,7 @@
  * This file is part of the sigrok project.
  *
  * Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/util.c b/util.c
index 75dd83e45996a02ce83ca6d41b8a024ed465bbce..060c25387df580d3df6f32597132eacbbaaf5f77 100644 (file)
--- a/util.c
+++ b/util.c
@@ -2,7 +2,7 @@
  * This file is part of the sigrok project.
  *
  * Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by