sr: Drop some obsolete and commented out code.

diff --git a/session.c b/session.c
index b2d63dfee98a20c47875f914ec519a908d80b680..6472f06a0fb589617e01d8c3cdea1c1c944e722f 100644 (file)
--- a/session.c
+++ b/session.c
@@ -154,23 +154,6 @@ int sr_session_device_add(struct sr_device *device)
        return SR_OK;
 }
 
-#if 0
-void sr_session_pa_clear(void)
-{
-       /*
-        * The protocols are pointers to the global set of PA plugins,
-        * so don't free them.
-        */
-       g_slist_free(session->analyzers);
-       session->analyzers = NULL;
-}
-
-void sr_session_pa_add(struct sr_analyzer *an)
-{
-       session->analyzers = g_slist_append(session->analyzers, an);
-}
-#endif
-
 /**
  * Clear all datafeed callbacks in the current session.
  *

diff --git a/sigrok-proto.h b/sigrok-proto.h
index 557730174aa8d46068f987b5133f60c69f4f300d..4105405be5867e836c684573583ce3b86859ed46 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -104,12 +104,6 @@ void sr_session_destroy(void);
 void sr_session_device_clear(void);
 int sr_session_device_add(struct sr_device *device);
 
-#if 0
-/* Protocol analyzers setup */
-void sr_session_pa_clear(void);
-void sr_session_pa_add(struct sr_analyzer *pa);
-#endif
-
 /* Datafeed setup */
 void sr_session_datafeed_callback_clear(void);
 void sr_session_datafeed_callback_add(sr_datafeed_callback callback);

diff --git a/sigrok.h.in b/sigrok.h.in
index 605aece4389e880a4516300ad69255d681f825b8..2e888ccafa13e72c434bc8a0f977a26aaea24afd 100644 (file)
--- a/sigrok.h.in
+++ b/sigrok.h.in
@@ -84,15 +84,6 @@ enum {
        SR_T_BOOL,
 };
 
-#if 0
-/* (Unused) protocol decoder stack entry */
-struct sr_protocol {
-       char *name;
-       int id;
-       int stackindex;
-};
-#endif
-
 /* sr_datafeed_packet.type values */
 enum {
        SR_DF_HEADER,
@@ -177,17 +168,6 @@ struct sr_output_format {
                      uint64_t *length_out);
 };
 
-#if 0
-struct sr_analyzer {
-       char *name;
-       char *filename;
-       /*
-        * TODO: Parameters? If so, configured plugins need another struct.
-        * TODO: Input and output format?
-        */
-};
-#endif
-
 struct sr_datastore {
        /* Size in bytes of the number of units stored in this datastore */
        int ds_unitsize;