BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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_*.
This commit is contained in:
Daniel Elstner 2015-09-11 23:22:54 +02:00 committed by Uwe Hermann
parent cbc1413f31
commit 4d6a50085e
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libsigrok-internal.h
View File

@ -564,9 +564,6 @@ struct sr_usb_dev_inst {
#endif #endif
#ifdef HAVE_LIBSERIALPORT #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 { struct sr_serial_dev_inst {
/** Port name, e.g. '/dev/tty42'. */ /** Port name, e.g. '/dev/tty42'. */
char *port; 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 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 struct sr_config *sr_config_new(uint32_t key, GVariant *data);
SR_PRIV void sr_config_free(struct sr_config *src); 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 -------------------------------------------------------------*/ /*--- session.c -------------------------------------------------------------*/

6
src/serial.c
View File

@ -519,13 +519,13 @@ SR_PRIV int serial_set_paramstr(struct sr_serial_dev_inst *serial,
if ((mstr = g_match_info_fetch(match, 3))) { if ((mstr = g_match_info_fetch(match, 3))) {
switch (mstr[0]) { switch (mstr[0]) {
case 'n': case 'n':
parity = SERIAL_PARITY_NONE; parity = SP_PARITY_NONE;
break; break;
case 'e': case 'e':
parity = SERIAL_PARITY_EVEN; parity = SP_PARITY_EVEN;
break; break;
case 'o': case 'o':
parity = SERIAL_PARITY_ODD; parity = SP_PARITY_ODD;
break; break;
} }
} }