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

Use sp_get_port_handle to get an fd for adding/removing serial sources.

This commit is contained in:
Martin Ling 2013-12-07 19:19:20 +00:00
parent af473e0eb2
commit a0a4c0fb09
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hardware/common/serial.c
View File

@ -642,10 +642,22 @@ SR_PRIV int sr_serial_extract_options(GSList *options, const char **serial_devic
SR_PRIV int serial_source_add(struct sr_serial_dev_inst *serial, int events, SR_PRIV int serial_source_add(struct sr_serial_dev_inst *serial, int events,
int timeout, sr_receive_data_callback_t cb, void *cb_data) int timeout, sr_receive_data_callback_t cb, void *cb_data)
{ {
return sr_source_add(serial->fd, events, timeout, cb, cb_data); #ifdef _WIN32
return SR_ERR;
#else
int fd;
sp_get_port_handle(serial->data, &fd);
return sr_source_add(fd, events, timeout, cb, cb_data);
#endif
} }
SR_PRIV int serial_source_remove(struct sr_serial_dev_inst *serial) SR_PRIV int serial_source_remove(struct sr_serial_dev_inst *serial)
{ {
return sr_source_remove(serial->fd); #ifdef _WIN32
return SR_ERR;
#else
int fd;
sp_get_port_handle(serial->data, &fd);
return sr_source_remove(fd);
#endif
} }