# HG changeset patch
# User yannic
# Date 2011-07-27 13:21:05
# Node ID 53f78c15a9b9507fd22ee27c3da096b7ec6b23fe
# Parent  1e2e24b083a8cf26c714f99cac82b8490c1fa888

rs232read clean

diff --git a/RS232.c b/RS232.c
--- a/RS232.c
+++ b/RS232.c
@@ -181,27 +181,6 @@ int rs232setup(int fd, int ChSize, int B
 int rs232write(int fd,char *psWrite)
 {
 	int Len_psWrite = (int)strlen(psWrite);
-	int charsWrite=0;
-
-	if (fd == -1)
-	{
-		return -1;
-	}
-	else
-	{
-		charsWrite = write(fd, psWrite, Len_psWrite);
-		return charsWrite;
-	}
-}
-
-
-int rs232read(int fd,char *psReadHex)
-{
-	char ReadBuff[ReadBufferSize];
-	int CharsRead=0, Reads=0, i=0;
-
-	for(i=0;i<ReadBufferSize;i++)
-		ReadBuff[i]='\0';
 
 	if (fd == -1)
 	{
@@ -209,21 +188,20 @@ int rs232read(int fd,char *psReadHex)
 	}
 	else
 	{
-		read(fd, ReadBuff, ReadBufferSize);
-		while(CharsRead<(ReadBufferSize-1))
-		{
-			for(i=0;i<ReadBufferSize;i++)
-				ReadBuff[i]='\0';
+		return write(fd, psWrite, Len_psWrite);
+	}
+}
+
 
-			if((Reads = read(fd, ReadBuff, (ReadBufferSize-1)-CharsRead)) > 0)
-			{
-				CharsRead = CharsRead + Reads;
-				ReadBuff[CharsRead]='\0';
-				strcat(psReadHex, ReadBuff);
-			}
-
-		}
-		return CharsRead;
+int rs232read(int fd,char *psReadHex, int ReadBufferSize)
+{
+	if (fd == -1)
+	{
+		return fd;
+	}
+	else
+	{
+		return read(fd, psReadHex, ReadBufferSize);
 	}
 }
 
diff --git a/RS232.h b/RS232.h
--- a/RS232.h
+++ b/RS232.h
@@ -1,11 +1,9 @@
 // SOPSUYSI_RS232.h
 
 
-#define ReadBufferSize 16*1024
-
 
 int rs232open(char* psPortName);
 int rs232close(int fd);
 int rs232setup(int fd, int ChSize, int BaudeRate, int Parity, int NbStop);
 int rs232write(int fd,char *psWrite);
-int rs232read(int fd,char *psReadHex);
+int rs232read(int fd,char *psReadHex, int ReadBufferSize);