X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=libserialport_internal.h;h=669152b675339927e5b0dda0e993230c637fbe7c;hb=df3b70a88849a50aad823a7c0a96ae83eb474a32;hp=9d582f8e72fbef5a1009b2f31d234ddedd737be1;hpb=653cef3ab1a71a76c8c5a503af6ce74b731ecc42;p=libserialport.git

diff --git a/libserialport_internal.h b/libserialport_internal.h
index 9d582f8..669152b 100644
--- a/libserialport_internal.h
+++ b/libserialport_internal.h
@@ -18,8 +18,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef LIBSERIALPORT_LIBSERIALPORT_INTERNAL_H
+#define LIBSERIALPORT_LIBSERIALPORT_INTERNAL_H
+
+
 #ifdef __linux__
-#define _BSD_SOURCE // for timeradd, timersub, timercmp
+/* For timeradd, timersub, timercmp. */
+#define _BSD_SOURCE 1 /* for glibc < 2.19 */
+#define _DEFAULT_SOURCE 1 /* for glibc >= 2.20 */
 #endif
 
 #include <string.h>
@@ -31,12 +37,17 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <limits.h>
 #ifdef _WIN32
 #include <windows.h>
 #include <tchar.h>
 #include <setupapi.h>
 #include <cfgmgr32.h>
+#undef DEFINE_GUID
+#define DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
+	static const GUID name = { l,w1,w2,{ b1,b2,b3,b4,b5,b6,b7,b8 } }
 #include <usbioctl.h>
+#include <usbiodef.h>
 #else
 #include <limits.h>
 #include <termios.h>
@@ -60,7 +71,7 @@
 #include "linux_termios.h"
 
 /* TCGETX/TCSETX is not available everywhere. */
-#if defined(TCGETX) && defined(TCSETX) && defined(HAVE_TERMIOX)
+#if defined(TCGETX) && defined(TCSETX) && defined(HAVE_STRUCT_TERMIOX)
 #define USE_TERMIOX
 #endif
 #endif
@@ -74,7 +85,7 @@
 #endif
 
 /* Non-standard baudrates are not available everywhere. */
-#if defined(HAVE_TERMIOS_SPEED) || defined(HAVE_TERMIOS2_SPEED)
+#if (defined(HAVE_TERMIOS_SPEED) || defined(HAVE_TERMIOS2_SPEED)) && defined(HAVE_DECL_BOTHER)
 #define USE_TERMIOS_SPEED
 #endif
 
@@ -100,6 +111,7 @@ struct sp_port {
 	DWORD events;
 	BYTE pending_byte;
 	BOOL writing;
+	BOOL wait_running;
 #else
 	int fd;
 #endif
@@ -151,10 +163,7 @@ struct std_baudrate {
 	int value;
 };
 
-extern const struct std_baudrate std_baudrates[];
-
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
-#define NUM_STD_BAUDRATES ARRAY_SIZE(std_baudrates)
 
 extern void (*sp_debug_handler)(const char *format, ...);
 
@@ -173,18 +182,19 @@ extern void (*sp_debug_handler)(const char *format, ...);
 #define RETURN() do { \
 	DEBUG_FMT("%s returning", __func__); \
 	return; \
-} while(0)
+} while (0)
 #define RETURN_CODE(x) do { \
 	DEBUG_FMT("%s returning " #x, __func__); \
 	return x; \
 } while (0)
 #define RETURN_CODEVAL(x) do { \
 	switch (x) { \
-		case SP_OK: RETURN_CODE(SP_OK); \
-		case SP_ERR_ARG: RETURN_CODE(SP_ERR_ARG); \
-		case SP_ERR_FAIL: RETURN_CODE(SP_ERR_FAIL); \
-		case SP_ERR_MEM: RETURN_CODE(SP_ERR_MEM); \
-		case SP_ERR_SUPP: RETURN_CODE(SP_ERR_SUPP); \
+	case SP_OK: RETURN_CODE(SP_OK); \
+	case SP_ERR_ARG: RETURN_CODE(SP_ERR_ARG); \
+	case SP_ERR_FAIL: RETURN_CODE(SP_ERR_FAIL); \
+	case SP_ERR_MEM: RETURN_CODE(SP_ERR_MEM); \
+	case SP_ERR_SUPP: RETURN_CODE(SP_ERR_SUPP); \
+	default: RETURN_CODE(SP_ERR_FAIL); \
 	} \
 } while (0)
 #define RETURN_OK() RETURN_CODE(SP_OK);
@@ -216,10 +226,12 @@ extern void (*sp_debug_handler)(const char *format, ...);
 #define TRACE(fmt, ...) DEBUG_FMT("%s(" fmt ") called", __func__, __VA_ARGS__)
 #define TRACE_VOID() DEBUG_FMT("%s() called", __func__)
 
-#define TRY(x) do { int ret = x; if (ret != SP_OK) RETURN_CODEVAL(ret); } while (0)
+#define TRY(x) do { int retval = x; if (retval != SP_OK) RETURN_CODEVAL(retval); } while (0)
 
 SP_PRIV struct sp_port **list_append(struct sp_port **list, const char *portname);
 
 /* OS-specific Helper functions. */
 SP_PRIV enum sp_return get_port_details(struct sp_port *port);
 SP_PRIV enum sp_return list_ports(struct sp_port ***list);
+
+#endif