Adding moxanix.cfg file. Moxanix is now configured with it.

tty.c

@@ -7,6 +7,7 @@
 #define TTY_THREAD_TIMEOUT_SEC 30
 #define TTY_WAIT_TIMEOUT 5 /* seconds for select() timeout in server loop */
 #define NAME "tty"
+#define TTY_DEF_BAUD_RATE B115200
 
 /* Opens the tty device and configures it. */
 int tty_open(struct tty_t *tty_dev) {
@@ -22,28 +23,36 @@ int tty_open(struct tty_t *tty_dev) {
 		tty_dev->fd = fd;
 
 	tty_dev->ttyset.c_iflag &= ~(IGNBRK | BRKINT | ICRNL | INLCR |
-								 PARMRK | INPCK | ISTRIP | IXON);
+							 	 PARMRK | INPCK | ISTRIP | IXON);
 	tty_dev->ttyset.c_oflag &= ~(OCRNL | ONLCR | ONLRET |
-								 ONOCR | OFILL | OLCUC | OPOST);
+							 	 ONOCR | OFILL | OLCUC | OPOST);
 	tty_dev->ttyset.c_lflag &= ~(ECHO | ECHONL | ICANON | IEXTEN | ISIG);
 	tty_dev->ttyset.c_cflag &= ~(CSIZE | PARENB);
 	tty_dev->ttyset.c_cflag |= CS8;
 	tty_dev->ttyset.c_cc[VMIN]  = 1;
 	tty_dev->ttyset.c_cc[VTIME] = 0;
 
-	if(cfsetispeed(&(tty_dev->ttyset), B115200) < 0 || cfsetospeed(&(tty_dev->ttyset), B115200) < 0) {
+	/* if speed is set to B0 (e.g. cfg file is not provided), default values are used */
+	if (cfgetispeed(&(tty_dev->ttyset)) == baud_to_speed(0) && 
+		cfsetispeed(&(tty_dev->ttyset), TTY_DEF_BAUD_RATE) < 0) {
 		fprintf(stderr, "[%s] error configuring tty device speed\n", NAME);
 		return -errno;
-    }
-    
-    if(tcsetattr(tty_dev->fd, TCSAFLUSH, &(tty_dev->ttyset)) < 0) {
+	}
+	if (cfgetospeed(&(tty_dev->ttyset)) == baud_to_speed(0) && 
+		cfsetospeed(&(tty_dev->ttyset), TTY_DEF_BAUD_RATE) < 0) {
+		fprintf(stderr, "[%s] error configuring tty device speed\n", NAME);
+		return -errno;
+   	}
+
+   	if(tcsetattr(tty_dev->fd, TCSAFLUSH, &(tty_dev->ttyset)) < 0) {
 		fprintf(stderr, "[%s] error configuring tty device\n", NAME);
 		return -errno;
-    }
+   	}
 
 	return 0;
-	
+
 }
+
 /* Closes the tty device. */
 int tty_close(struct tty_t *tty_dev) {
 	// close and set "tty_dev.fd = -1"
@@ -88,7 +97,7 @@ void *tty_thread_func(void *arg) {
 		tv.tv_usec = 0;
 		FD_ZERO(&read_fds);
 		FD_SET(tty_dev->fd, &read_fds);
-		
+			
 		/* wait with select() */
 		ret = select(tty_dev->fd + 1, &read_fds, NULL, NULL, &tv);
 
@@ -101,9 +110,9 @@ void *tty_thread_func(void *arg) {
 		//sleep(10);
 		//if (read(tty_dev->fd, &c, 1) > 0)        
 		//	printf("%c", c); 
-		     	                                
+	     	                                	
 		//fprintf(stderr, "[%s] tty thread reporting ...\n", NAME);
-		//i++;
+			//i++;
 	}
 
 	fprintf(stderr, "[%s] tty thread stoped\n", NAME);
@@ -111,3 +120,97 @@ void *tty_thread_func(void *arg) {
 	return (void *)tty_dev;;
 }
 
+/*
+ * Converts POSIX speed_t to a baud rate.  The values of the
+ * constants for speed_t are not themselves portable.
+ */
+int speed_to_baud(speed_t speed)
+{
+	switch (speed) {
+	case B0:
+		return 0;
+	case B50:
+		return 50;
+	case B75:
+		return 75;
+	case B110:
+		return 110;
+	case B134:
+		return 134;
+	case B150:
+		return 150;
+	case B200:
+		return 200;
+	case B300:
+		return 300;
+	case B600:
+		return 600;
+	case B1200:
+		return 1200;
+	case B1800:
+		return 1800;
+	case B2400:
+		return 2400;
+	case B4800:
+		return 4800;
+	case B9600:
+		return 9600;
+	case B19200:
+		return 19200;
+	case B38400:
+		return 38400;
+	case B57600:
+		return 57600;
+	case B115200:
+		return 115200;
+	default:
+		return 115200;
+	}
+}
+
+/*
+ * Converts a numeric baud rate to a POSIX speed_t.
+ */
+speed_t baud_to_speed(int baud)
+{
+	switch (baud) {
+	case 0:
+		return B0;
+	case 50:
+		return B50;
+	case 75:
+		return B75;
+	case 110:
+		return B110;
+	case 134:
+		return B134;
+	case 150:
+		return B150;
+	case 200:
+		return B200;
+	case 300:
+		return B300;
+	case 600:
+		return B600;
+	case 1200:
+		return B1200;
+	case 1800:
+		return B1800;
+	case 2400:
+		return B2400;
+	case 4800:
+		return B4800;
+	case 9600:
+		return B9600;
+	case 19200:
+		return B19200;
+	case 38400:
+		return B38400;
+	case 57600:
+		return B57600;
+	case 115200:
+		return B115200;
+	default:
+		return B115200;
+	}
+}