More fiddling with coke code

[tpg/opendispense2.git] / src / server / main.c

diff --git a/src/server/main.c b/src/server/main.c
index a903f75..b612f6f 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -13,6 +13,9 @@
 #include <signal.h>
 #include "common.h"
 #include <termios.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 // === IMPORTS ===
 extern void    Init_Cokebank(const char *Argument);    // cokebank.c
@@ -120,21 +123,31 @@ void CompileRegex(regex_t *regex, const char *pattern, int flags)
 }
 
 // Serial helper
-void InitSerial(int FD, int BaudRate)
+int InitSerial(const char *File, int BaudRate)
 {
        struct termios  info;
         int    baud;
+        int    fd;
+       
+       fd = open(File, O_RDWR | O_NOCTTY | O_NONBLOCK);
+       if( fd == -1 )  return -1;
        
        switch(BaudRate)
        {
        case 9600:      baud = B9600;   break;
-       default:        return ;
+       default:        close(fd);      return -1;
        }
        
-       cfmakeraw(&info);       // Sets 8N1
+       info.c_lflag = 0;       // Non-Canoical, No Echo
+       info.c_cflag = baud | CS8 | CLOCAL | CREAD;     // baud, 8N1
        cfsetspeed(&info, baud);
+       info.c_cc[VTIME] = 0;   // No time limit
+       info.c_cc[VMIN] = 1;    // Block until 1 char
+       
+       tcflush(fd, TCIFLUSH);
+       tcsetattr(fd, TCSANOW, &info);
        
-       tcsetattr(FD, TCSANOW, &info);
+       return fd;
 }