From: Martin Ling <redacted>
Date: Sat, 7 Dec 2013 19:19:20 +0000 (+0000)
Subject: Use sp_get_port_handle to get an fd for adding/removing serial sources.
X-Git-Tag: libsigrok-0.3.0~456
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=a0a4c0fb09cac1105ad03325d7232a8f492f181c;p=libsigrok.git

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

diff --git a/hardware/common/serial.c b/hardware/common/serial.c
index af80356a..781edc19 100644
--- a/hardware/common/serial.c
+++ b/hardware/common/serial.c
@@ -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,
 		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)
 {
-	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
 }