From: Daniel Elstner <redacted>
Date: Fri, 11 Sep 2015 21:22:54 +0000 (+0200)
Subject: libsigrok-internal.h: Remove unused prototypes
X-Git-Tag: libsigrok-0.4.0~302
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=4d6a50085ea9ea4f25850b22737f621a3e13d953;p=libsigrok.git

libsigrok-internal.h: Remove unused prototypes

The sr_source_* prototypes are not used anywhere, so remove them.
Also get rid of the SERIAL_PARITY_* aliases for SP_PARITY_*.
---

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 8fb9006a..c2fa671b 100644
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -564,9 +564,6 @@ struct sr_usb_dev_inst {
 #endif
 
 #ifdef HAVE_LIBSERIALPORT
-#define SERIAL_PARITY_NONE SP_PARITY_NONE
-#define SERIAL_PARITY_EVEN SP_PARITY_EVEN
-#define SERIAL_PARITY_ODD  SP_PARITY_ODD
 struct sr_serial_dev_inst {
 	/** Port name, e.g. '/dev/tty42'. */
 	char *port;
@@ -682,15 +679,6 @@ SR_PRIV int sr_variant_type_check(uint32_t key, GVariant *data);
 SR_PRIV void sr_hw_cleanup_all(const struct sr_context *ctx);
 SR_PRIV struct sr_config *sr_config_new(uint32_t key, GVariant *data);
 SR_PRIV void sr_config_free(struct sr_config *src);
-SR_PRIV int sr_source_remove(int fd);
-SR_PRIV int sr_source_remove_pollfd(GPollFD *pollfd);
-SR_PRIV int sr_source_remove_channel(GIOChannel *channel);
-SR_PRIV int sr_source_add(int fd, int events, int timeout,
-		sr_receive_data_callback cb, void *cb_data);
-SR_PRIV int sr_source_add_pollfd(GPollFD *pollfd, int timeout,
-		sr_receive_data_callback cb, void *cb_data);
-SR_PRIV int sr_source_add_channel(GIOChannel *channel, int events, int timeout,
-		sr_receive_data_callback cb, void *cb_data);
 
 /*--- session.c -------------------------------------------------------------*/
 
diff --git a/src/serial.c b/src/serial.c
index 136edcad..e19c7c87 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -519,13 +519,13 @@ SR_PRIV int serial_set_paramstr(struct sr_serial_dev_inst *serial,
 		if ((mstr = g_match_info_fetch(match, 3))) {
 			switch (mstr[0]) {
 			case 'n':
-				parity = SERIAL_PARITY_NONE;
+				parity = SP_PARITY_NONE;
 				break;
 			case 'e':
-				parity = SERIAL_PARITY_EVEN;
+				parity = SP_PARITY_EVEN;
 				break;
 			case 'o':
-				parity = SERIAL_PARITY_ODD;
+				parity = SP_PARITY_ODD;
 				break;
 			}
 		}