Re: [PATCH] When setting the serial port, the previous settings need to be preserved.

[Ryan Raasch <ryan.raasch@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

Sorry. I have had a long few days. The last patch was just COMPLETELY 
wrong :(

I think i got it right this time...

Apologies,

Ryan

Ryan Raasch wrote:
> 
> Denis Kenzior wrote:
>> Hi Ryan,
>>
>>> This took a while to locate. Shouldn't it be possible to use stty
>>> outside the daemon, and then daemon would just continue as usual?
>>>
>>> In my case, the cread was being removed, so no input data could be read.
>>
>> Sorry but the patch is wrong, since you're blowing away all options 
>> that have been set via the GHashTable.
> 
> Yea. Sorry. Put it in the wrong place, uggh. It should go before setting 
> the options, since the switches are or'ing and xor'ing.
> 
>>
>> GAtTty is really a convenience method, if you need something specific, 
>> pass the option in the GHashTable or setup the fd however you wish by 
>> yourself.
>>
>> Regards,
>> -Denis
> 
> But, there is a problem with the opening of the serial port b/c the 
> CREAD flag is destroyed if it is active, making the serial port unreadable.
> 
> Ryan
> 
>> _______________________________________________
>> ofono mailing list
>> ofono-bdc2hr5oBkPYtjvyW6yDsg(a)public.gmane.org
>> http://lists.ofono.org/listinfo/ofono
> 

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: serial_port_enable_CREAD.patch --]
[-- Type: text/x-patch, Size: 1311 bytes --]

diff --git a/gatchat/gattty.c b/gatchat/gattty.c
index 63d26d4..d624336 100644
--- a/gatchat/gattty.c
+++ b/gatchat/gattty.c
@@ -97,6 +97,19 @@ static gboolean set_baud(const char *baud, struct termios *ti)
 	return TRUE;
 }
 
+static gboolean set_read(const char *bits, struct termios *ti)
+{
+	if (g_str_equal(bits, "off"))
+		ti->c_cflag &= ~(CREAD);
+	else if (g_str_equal(bits, "on"))
+		ti->c_cflag |= CREAD;
+	else
+		return FALSE;
+
+	return TRUE;
+
+}
+
 static gboolean set_stop_bits(const char *bits, struct termios *ti)
 {
 	if (g_str_equal(bits, "1"))
@@ -186,6 +199,12 @@ static int open_device(const char *tty, GHashTable *options)
 	memset(&ti, 0, sizeof(ti));
 	cfmakeraw(&ti);
 
+	fd = open(tty, O_RDWR | O_NOCTTY | O_NONBLOCK);
+	if (fd < 0)
+		return -1;
+
+	tcgetattr(fd,&ti);
+
 	if (options) {
 		GHashTableIter iter;
 		const char *key;
@@ -210,16 +229,14 @@ static int open_device(const char *tty, GHashTable *options)
 				ok = set_rtscts(value, &ti);
 			else if (g_str_equal(key, "local"))
 				ok = set_local(value, &ti);
+			else if (g_str_equal(key, "read"))
+				ok = set_read(value, &ti);
 
 			if (ok == FALSE)
 				return -1;
 		}
 	}
 
-	fd = open(tty, O_RDWR | O_NOCTTY | O_NONBLOCK);
-	if (fd < 0)
-		return -1;
-
 	tcflush(fd, TCIOFLUSH);
 	tcsetattr(fd, TCSANOW, &ti);