X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=libserialport_internal.h;h=6ea5e5a2e57ebfa345357ed4acfdf4dd80f3d916;hb=2e0437c28e272ff6c64c58d9b032986979289fae;hp=9d8e41fe3cf7fe8402310c0173060c1c04ac00ab;hpb=7c081505e5ccdfc6178855d65499121ef1e58e53;p=libserialport.git

diff --git a/libserialport_internal.h b/libserialport_internal.h
index 9d8e41f..6ea5e5a 100644
--- a/libserialport_internal.h
+++ b/libserialport_internal.h
@@ -18,10 +18,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
+#ifndef LIBSERIALPORT_LIBSERIALPORT_INTERNAL_H
+#define LIBSERIALPORT_LIBSERIALPORT_INTERNAL_H
+
 
 #ifdef __linux__
-#define _BSD_SOURCE // for timeradd, timersub, timercmp
+/* For timeradd, timersub, timercmp, realpath. */
+#define _BSD_SOURCE 1 /* for glibc < 2.19 */
+#define _DEFAULT_SOURCE 1 /* for glibc >= 2.20 */
 #endif
 
 #include <string.h>
@@ -48,7 +52,6 @@
 #include <termios.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
-#include <limits.h>
 #include <poll.h>
 #endif
 #ifdef __APPLE__
@@ -66,7 +69,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
@@ -80,7 +83,7 @@
 #endif
 
 /* Non-standard baudrates are not available everywhere. */
-#if (defined(HAVE_TERMIOS_SPEED) || defined(HAVE_TERMIOS2_SPEED)) && defined(HAVE_BOTHER)
+#if (defined(HAVE_TERMIOS_SPEED) || defined(HAVE_TERMIOS2_SPEED)) && HAVE_DECL_BOTHER
 #define USE_TERMIOS_SPEED
 #endif
 
@@ -106,6 +109,7 @@ struct sp_port {
 	DWORD events;
 	BYTE pending_byte;
 	BOOL writing;
+	BOOL wait_running;
 #else
 	int fd;
 #endif
@@ -157,10 +161,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, ...);
 
@@ -179,18 +180,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);
@@ -222,10 +224,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