From a915739887477b28d924ecc8417ee107d125bd6c Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 6 Sep 2009 18:48:27 +0000
Subject: Switched to xorg-server-1.6.99.900.tar.gz

---
 .../hw/xfree86/os-support/shared/posix_tty.c       | 47 +++++++++-------------
 1 file changed, 20 insertions(+), 27 deletions(-)

(limited to 'xorg-server/hw/xfree86/os-support/shared/posix_tty.c')

diff --git a/xorg-server/hw/xfree86/os-support/shared/posix_tty.c b/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
index 316526bdc..bf1bb03a3 100644
--- a/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
+++ b/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
@@ -111,7 +111,7 @@ GetBaud (int baudrate)
 	return (0);
 }
 
-_X_EXPORT int
+int
 xf86OpenSerial (pointer options)
 {
 	struct termios t;
@@ -194,7 +194,7 @@ xf86OpenSerial (pointer options)
 	return (fd);
 }
 
-_X_EXPORT int
+int
 xf86SetSerial (int fd, pointer options)
 {
 	struct termios t;
@@ -365,7 +365,7 @@ xf86SetSerial (int fd, pointer options)
 	return (r);
 }
 
-_X_EXPORT int
+int
 xf86SetSerialSpeed (int fd, int speed)
 {
 	struct termios t;
@@ -396,41 +396,36 @@ xf86SetSerialSpeed (int fd, int speed)
 	return (r);
 }
 
-_X_EXPORT int
+int
 xf86ReadSerial (int fd, void *buf, int count)
 {
 	int r;
-#ifdef DEBUG
 	int i;
-#endif
+
 	SYSCALL (r = read (fd, buf, count));
-#ifdef DEBUG
-	ErrorF("ReadingSerial: 0x%x",
+	DebugF("ReadingSerial: 0x%x",
 	       (unsigned char)*(((unsigned char *)buf)));
 	for (i = 1; i < r; i++)
-	    ErrorF(", 0x%x",(unsigned char)*(((unsigned char *)buf) + i));
-	ErrorF("\n");
-#endif
+	    DebugF(", 0x%x",(unsigned char)*(((unsigned char *)buf) + i));
+	DebugF("\n");
 	return (r);
 }
 
-_X_EXPORT int
+int
 xf86WriteSerial (int fd, const void *buf, int count)
 {
 	int r;
-#ifdef DEBUG
 	int i;
 
-	ErrorF("WritingSerial: 0x%x",(unsigned char)*(((unsigned char *)buf)));
+	DebugF("WritingSerial: 0x%x",(unsigned char)*(((unsigned char *)buf)));
 	for (i = 1; i < count; i++)
 	    ErrorF(", 0x%x",(unsigned char)*(((unsigned char *)buf) + i));
-	ErrorF("\n");
-#endif
+	DebugF("\n");
 	SYSCALL (r = write (fd, buf, count));
 	return (r);
 }
 
-_X_EXPORT int
+int
 xf86CloseSerial (int fd)
 {
 	int r;
@@ -439,7 +434,7 @@ xf86CloseSerial (int fd)
 	return (r);
 }
 
-_X_EXPORT int
+int
 xf86WaitForInput (int fd, int timeout)
 {
 	fd_set readfds;
@@ -465,7 +460,7 @@ xf86WaitForInput (int fd, int timeout)
 	return (r);
 }
 
-_X_EXPORT int
+int
 xf86SerialSendBreak (int fd, int duration)
 {
 	int r;
@@ -475,16 +470,14 @@ xf86SerialSendBreak (int fd, int duration)
 	
 }
 
-_X_EXPORT int
+int
 xf86FlushInput(int fd)
 {
 	fd_set fds;
 	struct timeval timeout;
 	char c[4];
 
-#ifdef DEBUG
-	ErrorF("FlushingSerial\n");
-#endif
+	DebugF("FlushingSerial\n");
 	if (tcflush(fd, TCIFLUSH) == 0)
 		return 0;
 
@@ -576,7 +569,7 @@ getOsStateMask(void)
 
 static int osStateMask = 0;
 
-_X_EXPORT int
+int
 xf86SetSerialModemState(int fd, int state)
 {
 	int ret;
@@ -609,7 +602,7 @@ xf86SetSerialModemState(int fd, int state)
 #endif
 }
 
-_X_EXPORT int
+int
 xf86GetSerialModemState(int fd)
 {
 	int ret;
@@ -632,7 +625,7 @@ xf86GetSerialModemState(int fd)
 #endif
 }
 
-_X_EXPORT int
+int
 xf86SerialModemSetBits(int fd, int bits)
 {
 	int ret;
@@ -654,7 +647,7 @@ xf86SerialModemSetBits(int fd, int bits)
 #endif
 }
 
-_X_EXPORT int
+int
 xf86SerialModemClearBits(int fd, int bits)
 {
 	int ret;
-- 
cgit v1.2.3