From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Mon, 9 Nov 2009 15:59:51 +0000 (+0000)
Subject: Clean code and fix compile error.
X-Git-Tag: 2.4.0~89
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=42c8858fcf3b852cb7e34d7e9170b484da59e63a;p=bertos.git

Clean code and fix compile error.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3108 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/bertos/drv/ser.c b/bertos/drv/ser.c
index bd27486b..a684ebba 100644
--- a/bertos/drv/ser.c
+++ b/bertos/drv/ser.c
@@ -241,38 +241,20 @@ static size_t ser_write(struct KFile *fd, const void *_buf, size_t size)
 #if CONFIG_SER_RXTIMEOUT != -1 || CONFIG_SER_TXTIMEOUT != -1
 void ser_settimeouts(struct Serial *fd, mtime_t rxtimeout, mtime_t txtimeout)
 {
-	fd->rxtimeout = ms_to_ticks(rxtimeout);
-	fd->txtimeout = ms_to_ticks(txtimeout);
+	#if CONFIG_SER_RXTIMEOUT != -1
+		fd->rxtimeout = ms_to_ticks(rxtimeout);
+	#else
+		(void)rxtimeout;
+	#endif
+
+	#if CONFIG_SER_TXTIMEOUT != -1
+		fd->txtimeout = ms_to_ticks(txtimeout);
+	#else
+		(void)txtimeout;
+	#endif
 }
 #endif /* CONFIG_SER_RXTIMEOUT || CONFIG_SER_TXTIMEOUT */
 
-#if CONFIG_SER_RXTIMEOUT != -1
-/**
- * Discard input to resynchronize with remote end.
- *
- * Discard incoming data until the port stops receiving
- * characters for at least \a delay milliseconds.
- *
- * \note Serial errors are reset before and after executing the purge.
- */
-void ser_resync(struct Serial *fd, mtime_t delay)
-{
-	mtime_t old_rxtimeout = ticks_to_ms(fd->rxtimeout);
-
-	ser_settimeouts(fd, delay, ticks_to_ms(fd->txtimeout));
-	do
-	{
-		ser_setstatus(fd, 0);
-		ser_getchar(fd);
-	}
-	while (!(ser_getstatus(fd) & SERRF_RXTIMEOUT));
-
-	/* Restore port to an usable status */
-	ser_setstatus(fd, 0);
-	ser_settimeouts(fd, old_rxtimeout, ticks_to_ms(fd->txtimeout));
-}
-#endif /* CONFIG_SER_RXTIMEOUT */
-
 
 void ser_setbaudrate(struct Serial *fd, unsigned long rate)
 {