From 83f742080b2a83696cb9a0af48d03e8d8ba0b022 Mon Sep 17 00:00:00 2001
From: Jef Driesen <jefdriesen@users.sourceforge.net>
Date: Fri, 13 Jul 2012 21:34:17 +0200
Subject: [PATCH] Remove some unnecessary helper functions.

---
 src/serial.h       |  2 --
 src/serial_posix.c | 43 ++++++++++++++++---------------------------
 src/serial_win32.c |  7 -------
 3 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/src/serial.h b/src/serial.h
index 54b9982..24b5212 100644
--- a/src/serial.h
+++ b/src/serial.h
@@ -108,8 +108,6 @@ int serial_get_line (serial_t *device, int line);
 
 int serial_sleep (unsigned long timeout /* milliseconds */);
 
-int serial_timer (void);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/src/serial_posix.c b/src/serial_posix.c
index cf13abf..1279300 100644
--- a/src/serial_posix.c
+++ b/src/serial_posix.c
@@ -675,12 +675,16 @@ serial_set_break (serial_t *device, int level)
 }
 
 
-static int
-serial_set_status (int fd, int value, int level)
+int
+serial_set_dtr (serial_t *device, int level)
 {
+	if (device == NULL)
+		return -1; // EINVAL (Invalid argument)
+
 	unsigned long action = (level ? TIOCMBIS : TIOCMBIC);
 
-	if (ioctl (fd, action, &value) != 0) {
+	int value = TIOCM_DTR;
+	if (ioctl (device->fd, action, &value) != 0) {
 		TRACE ("ioctl");
 		return -1;
 	}
@@ -689,23 +693,21 @@ serial_set_status (int fd, int value, int level)
 }
 
 
-int
-serial_set_dtr (serial_t *device, int level)
-{
-	if (device == NULL)
-		return -1; // EINVAL (Invalid argument)
-
-	return serial_set_status (device->fd, TIOCM_DTR, level);
-}
-
-
 int
 serial_set_rts (serial_t *device, int level)
 {
 	if (device == NULL)
 		return -1; // EINVAL (Invalid argument)
 
-	return serial_set_status (device->fd, TIOCM_RTS, level);
+	unsigned long action = (level ? TIOCMBIS : TIOCMBIC);
+
+	int value = TIOCM_RTS;
+	if (ioctl (device->fd, action, &value) != 0) {
+		TRACE ("ioctl");
+		return -1;
+	}
+
+	return 0;
 }
 
 
@@ -786,16 +788,3 @@ serial_sleep (unsigned long timeout)
 
 	return 0;
 }
-
-
-int
-serial_timer (void)
-{
-	struct timeval tv;
-	if (gettimeofday (&tv, NULL) != 0) {
-		TRACE ("gettimeofday");
-		return 0;
-	}
-
-	return tv.tv_sec * 1000 + tv.tv_usec / 1000;
-}
diff --git a/src/serial_win32.c b/src/serial_win32.c
index 8c7ef08..ac81197 100644
--- a/src/serial_win32.c
+++ b/src/serial_win32.c
@@ -607,10 +607,3 @@ serial_sleep (unsigned long timeout)
 
 	return 0;
 }
-
-
-int
-serial_timer (void)
-{
-	return GetTickCount ();
-}