From: Uwe Hermann <redacted>
Date: Mon, 2 Jan 2012 13:25:52 +0000 (+0100)
Subject: sr: Drop some obsolete and commented out code.
X-Git-Tag: libsigrok-0.1.0~198
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=3b7c8f54fcf4c6de1ec67d11a9ec8975a2ddbb57;p=libsigrok.git

sr: Drop some obsolete and commented out code.
---

diff --git a/session.c b/session.c
index b2d63dfe..6472f06a 100644
--- 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 55773017..4105405b 100644
--- 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 605aece4..2e888cca 100644
--- 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;